diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py index a961ccdc52..7ed47d0b58 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCapsuleDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterCapsuleDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def CapsuleDamage(target_id, position0): position1 = azlmbr.object.construct('Vector3', position0.x + 1.0, position0.y, position0.z) @@ -30,4 +30,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterCapsuleDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py index 5692773d6d..a75aae21f0 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterCollision.py @@ -22,7 +22,7 @@ class Tests(): # fmt: on -def run(): +def ActorSplitsAfterCollision(): """ Summary: @@ -60,8 +60,8 @@ def run(): import azlmbr.legacy.general as general import azlmbr.bus - from editor_python_test_tools.utils import CollisionHandler - from editor_python_test_tools.utils import BlastNotificationHandler + from BlastUtils import CollisionHandler + from BlastUtils import BlastNotificationHandler # Constants TIMEOUT = 2.0 @@ -107,4 +107,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterCollision) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py index ddd90ca89a..d71f17c958 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterDamage.py @@ -20,7 +20,7 @@ class Tests(): # fmt: on -def run(damage_func): +def base_run(damage_func): """ Summary: @@ -56,7 +56,7 @@ def run(damage_func): import azlmbr.legacy.general as general import azlmbr.bus - from editor_python_test_tools.utils import BlastNotificationHandler + from BlastUtils import BlastNotificationHandler # Constants TIMEOUT = 2.0 diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py index 9b3fd1e596..e2783ef605 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterImpactSpreadDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterImpactSpreadDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def ImpactSpreadDamage(target_id, position): azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Impact Spread Damage", target_id, @@ -28,4 +28,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterImpactSpreadDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py index a219e63d34..f89a322bec 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterRadialDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterRadialDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def RadialDamage(target_id, position): azlmbr.destruction.BlastFamilyDamageRequestBus(azlmbr.bus.Event, "Radial Damage", target_id, @@ -28,4 +28,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterRadialDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py index e775be302d..5d2b6db1f3 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterShearDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterShearDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def ShearDamage(target_id, position): normal = azlmbr.object.construct('Vector3', 1.0, 0.0, 0.0) @@ -29,4 +29,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterShearDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py index 0195190348..bfbbde259a 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterStressDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterStressDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def StressDamage(target_id, position): force = azlmbr.object.construct('Vector3', 0.0, 0.0, -100.0) # Should be enough to break `brittle` objects @@ -28,4 +28,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterStressDamage) diff --git a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py index 0351fe42e2..e8f44bbc77 100755 --- a/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py +++ b/AutomatedTesting/Gem/PythonTests/Blast/ActorSplitsAfterTriangleDamage.py @@ -15,9 +15,9 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) from ActorSplitsAfterDamage import Tests -def run(): - from ActorSplitsAfterDamage import run as internal_run - from editor_python_test_tools.utils import Constants +def ActorSplitsAfterTriangleDamage(): + from ActorSplitsAfterDamage import base_run as internal_run + from BlastUtils import Constants def TriangleDamage(target_id, position): # Some points that form a triangle that contains the given position @@ -32,4 +32,8 @@ def run(): if __name__ == "__main__": - run() + import ImportPathHelper as imports + imports.init() + + from editor_python_test_tools.utils import Report + Report.start_test(ActorSplitsAfterTriangleDamage) \ No newline at end of file diff --git a/AutomatedTesting/Gem/PythonTests/Blast/Utils.py b/AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py old mode 100755 new mode 100644 similarity index 100% rename from AutomatedTesting/Gem/PythonTests/Blast/Utils.py rename to AutomatedTesting/Gem/PythonTests/Blast/BlastUtils.py diff --git a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt index 260d5ea1b1..d31ea6334c 100644 --- a/AutomatedTesting/Gem/PythonTests/CMakeLists.txt +++ b/AutomatedTesting/Gem/PythonTests/CMakeLists.txt @@ -170,7 +170,7 @@ endif() if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) ly_add_pytest( NAME AutomatedTesting::BlastTests - TEST_SUITE periodic + TEST_SUITE main TEST_SERIAL TRUE PATH ${CMAKE_CURRENT_LIST_DIR}/Blast/TestSuite_Active.py TIMEOUT 3600 @@ -178,6 +178,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED AND PAL_TRAIT_BUILD_HOST_TOOLS) Legacy::Editor AZ::AssetProcessor AutomatedTesting.Assets + COMPONENT Blast ) endif() diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py index 8701d2f211..82a7e92c16 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/atom_hydra_scripts/hydra_AtomEditorComponents_AddedToEntity.py @@ -7,25 +7,10 @@ distribution (the "License"). All use of this software is governed by the Licens or, if provided, by the license below or the license accompanying this file. Do not remove or modify any license notices. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + +Hydra script that creates an entity and attaches Atom components to it for test verification. """ -# This module does a bulk test and update of many components at once. -# Each test case is listed below in the format: -# "Test Case ID: Test Case Title (URL)" - -# C32078130: Tone Mapper (https://testrail.agscollab.com/index.php?/cases/view/32078130) -# C32078129: Light (https://testrail.agscollab.com/index.php?/cases/view/32078129) -# C32078131: Radius Weight Modifier (https://testrail.agscollab.com/index.php?/cases/view/32078131) -# C32078127: PostFX Layer (https://testrail.agscollab.com/index.php?/cases/view/32078127) -# C32078126: Point Light (https://testrail.agscollab.com/index.php?/cases/view/32078126) -# C32078125: Physical Sky (https://testrail.agscollab.com/index.php?/cases/view/32078125) -# C32078115: Global Skylight (IBL) (https://testrail.agscollab.com/index.php?/cases/view/32078115) -# C32078121: Exposure Control (https://testrail.agscollab.com/index.php?/cases/view/32078121) -# C32078120: Directional Light (https://testrail.agscollab.com/index.php?/cases/view/32078120) -# C32078119: DepthOfField (https://testrail.agscollab.com/index.php?/cases/view/32078119) -# C32078118: Decal (https://testrail.agscollab.com/index.php?/cases/view/32078118) -# C32078117: Area Light (https://testrail.agscollab.com/index.php?/cases/view/32078117) - import os import sys @@ -41,10 +26,6 @@ sys.path.append(os.path.join(azlmbr.paths.devroot, "AutomatedTesting", "Gem", "P import editor_python_test_tools.hydra_editor_utils as hydra from editor_python_test_tools.utils import TestHelper -from editor_python_test_tools.editor_test_helper import EditorTestHelper - - -EditorTestHelper = EditorTestHelper(log_prefix="AtomEditorComponents") def run(): @@ -151,28 +132,6 @@ def run(): # Wait for Editor idle loop before executing Python hydra scripts. TestHelper.init_idle() - # Create a new level. - new_level_name = "tmp_level" # Specified in TestAllComponentsBasicTests.py - heightmap_resolution = 512 - heightmap_meters_per_pixel = 1 - terrain_texture_resolution = 412 - use_terrain = False - - # Return codes are ECreateLevelResult defined in CryEdit.h - return_code = general.create_level_no_prompt( - new_level_name, heightmap_resolution, heightmap_meters_per_pixel, terrain_texture_resolution, use_terrain) - if return_code == 1: - general.log(f"{new_level_name} level already exists") - elif return_code == 2: - general.log("Failed to create directory") - elif return_code == 3: - general.log("Directory length is too long") - elif return_code != 0: - general.log("Unknown error, failed to create level") - else: - general.log(f"{new_level_name} level created successfully") - EditorTestHelper.after_level_load(bypass_viewport_resize=True) - # Delete all existing entities initially search_filter = azlmbr.entity.SearchFilter() all_entities = entity.SearchBus(azlmbr.bus.Broadcast, "SearchEntities", search_filter) @@ -209,7 +168,7 @@ def run(): entity_obj, ["Capsule Shape"], area_light)) # Decal Component - material_asset_path = os.path.join("Materials", "decal", "aiirship_nose_number_decal.material") + material_asset_path = os.path.join("Materials", "basic_grey.material") material_asset = asset.AssetCatalogRequestBus( bus.Broadcast, "GetAssetIdByPath", material_asset_path, math.Uuid(), False) ComponentTests( @@ -263,9 +222,12 @@ def run(): # Radius Weight Modifier Component ComponentTests("Radius Weight Modifier") - # Spot Light Component + # Light Component ComponentTests("Light") + # Display Mapper Component + ComponentTests("Display Mapper") + if __name__ == "__main__": run() diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py index 8031d7e65d..01474e6018 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_MainSuite.py @@ -9,35 +9,13 @@ remove or modify any license notices. This file is distributed on an "AS IS" BAS WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. """ -import logging -import os import pytest -import ly_test_tools.environment.file_system as file_system - -import editor_python_test_tools.hydra_test_utils as hydra - -logger = logging.getLogger(__name__) -EDITOR_TIMEOUT = 60 -TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts") - @pytest.mark.parametrize("project", ["AutomatedTesting"]) @pytest.mark.parametrize("launcher_platform", ['windows_editor']) -@pytest.mark.parametrize("level", ["tmp_level"]) +@pytest.mark.parametrize("level", ["auto_test"]) class TestAtomEditorComponents(object): - @pytest.fixture(autouse=True) - def setup_teardown(self, request, workspace, project, level): - # Cleanup our temp level - file_system.delete( - [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True) - - def teardown(): - # Cleanup our temp level - file_system.delete( - [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True) - - request.addfinalizer(teardown) # It requires at least one test def test_Dummy(self, request, editor, level, workspace, project, launcher_platform): diff --git a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py index a82d5c5fd4..a48466647e 100644 --- a/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py +++ b/AutomatedTesting/Gem/PythonTests/atom_renderer/test_Atom_SandboxSuite.py @@ -11,36 +11,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. import logging import os -import pytest -import ly_test_tools.environment.file_system as file_system +import pytest import editor_python_test_tools.hydra_test_utils as hydra logger = logging.getLogger(__name__) -EDITOR_TIMEOUT = 60 +EDITOR_TIMEOUT = 120 TEST_DIRECTORY = os.path.join(os.path.dirname(__file__), "atom_hydra_scripts") @pytest.mark.parametrize("project", ["AutomatedTesting"]) @pytest.mark.parametrize("launcher_platform", ['windows_editor']) -@pytest.mark.parametrize("level", ["tmp_level"]) +@pytest.mark.parametrize("level", ["auto_test"]) class TestAtomEditorComponents(object): - @pytest.fixture(autouse=True) - def setup_teardown(self, request, workspace, project, level): - # Cleanup our temp level - file_system.delete( - [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True) - - def teardown(): - # Cleanup our temp level - file_system.delete( - [os.path.join(workspace.paths.engine_root(), project, "Levels", "AtomLevels", level)], True, True) - - request.addfinalizer(teardown) @pytest.mark.test_case_id( - "C32078130", # Tone Mapper + "C32078117", # Area Light + "C32078130", # Display Mapper "C32078129", # Light "C32078131", # Radius Weight Modifier "C32078127", # PostFX Layer @@ -198,6 +186,18 @@ class TestAtomEditorComponents(object): "Light_test: Entity deleted: True", "Light_test: UNDO entity deletion works: True", "Light_test: REDO entity deletion works: True", + # Display Mapper Component + "Display Mapper Entity successfully created", + "Display Mapper_test: Component added to the entity: True", + "Display Mapper_test: Component removed after UNDO: True", + "Display Mapper_test: Component added after REDO: True", + "Display Mapper_test: Entered game mode: True", + "Display Mapper_test: Exit game mode: True", + "Display Mapper_test: Entity is hidden: True", + "Display Mapper_test: Entity is shown: True", + "Display Mapper_test: Entity deleted: True", + "Display Mapper_test: UNDO entity deletion works: True", + "Display Mapper_test: REDO entity deletion works: True", ] unexpected_lines = [ diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py index c5b8046f73..f0673a9438 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py @@ -41,7 +41,7 @@ class TestDynamicSliceInstanceSpawner(object): return console @pytest.mark.test_case_id("C28851763") - @pytest.mark.SUITE_main + @pytest.mark.SUITE_sandbox @pytest.mark.parametrize("launcher_platform", ['windows_editor']) def test_DynamicSliceInstanceSpawner_DynamicSliceSpawnerWorks(self, request, editor, level, workspace, project, launcher_platform): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py index a7f221b780..fc8c31fc7b 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_EmptyInstanceSpawner.py @@ -36,8 +36,13 @@ class TestEmptyInstanceSpawner(object): file_system.delete([os.path.join(workspace.paths.engine_root(), project, "Levels", level)], True, True) - @pytest.mark.test_case_id("C28851762") + # Main suite needs at least one test @pytest.mark.SUITE_main + def test_EmptyInstanceSpawner_Dummy(self, request, editor, level, workspace, project, launcher_platform): + pass + + @pytest.mark.test_case_id("C28851762") + @pytest.mark.SUITE_sandbox def test_EmptyInstanceSpawner_EmptySpawnerWorks(self, request, editor, level, launcher_platform): cfg_args = [level] diff --git a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py index ad8ae6481f..39ed85a65a 100755 --- a/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py +++ b/AutomatedTesting/Gem/PythonTests/physics/TestSuite_Periodic.py @@ -269,6 +269,8 @@ class TestAutomation(TestAutomationBase): from . import C18977601_Material_FrictionCombinePriority as test_module self._run_test(request, workspace, editor, test_module) + @pytest.mark.xfail( + reason="Something with the CryRenderer disabling is causing this test to fail now.") @revert_physics_config def test_C13895144_Ragdoll_ChangeLevel(self, request, workspace, editor, launcher_platform): from . import C13895144_Ragdoll_ChangeLevel as test_module diff --git a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas index a422f072a5..34e80f3ccd 100644 --- a/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas +++ b/AutomatedTesting/Levels/Physics/C12712452_ScriptCanvas_CollisionEvents/collision_events_script.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,21 +16,21 @@ - + - + - + - + - + @@ -39,23 +39,9 @@ - - - - - - - - - - - - - - - - + + @@ -76,12 +62,13 @@ + - + @@ -91,45 +78,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -150,12 +100,13 @@ + - + @@ -165,8 +116,8 @@ - - + + @@ -187,123 +138,13 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -317,22 +158,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - - - + @@ -354,52 +258,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - + + - + - - - - - - - - - + + + + + + + - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + @@ -408,7 +516,375 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -441,7 +917,7 @@ - + @@ -468,6 +944,7 @@ + @@ -505,6 +982,7 @@ + @@ -542,6 +1020,7 @@ + @@ -579,6 +1058,7 @@ + @@ -616,6 +1096,7 @@ + @@ -653,6 +1134,7 @@ + @@ -690,6 +1172,7 @@ + @@ -719,7 +1202,7 @@ - + @@ -746,6 +1229,7 @@ + @@ -800,1929 +1284,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2755,7 +1317,7 @@ - + @@ -2782,6 +1344,7 @@ + @@ -2819,6 +1382,7 @@ + @@ -2856,6 +1420,7 @@ + @@ -2893,6 +1458,7 @@ + @@ -2930,6 +1496,7 @@ + @@ -2967,6 +1534,7 @@ + @@ -3004,6 +1572,7 @@ + @@ -3033,7 +1602,7 @@ - + @@ -3060,6 +1629,7 @@ + @@ -3114,530 +1684,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3683,6 +1730,7 @@ + @@ -3720,6 +1768,7 @@ + @@ -3757,6 +1806,7 @@ + @@ -3794,6 +1844,7 @@ + @@ -3831,6 +1882,7 @@ + @@ -3873,6 +1925,7 @@ + @@ -3910,6 +1963,7 @@ + @@ -3947,6 +2001,7 @@ + @@ -3984,6 +2039,7 @@ + @@ -4021,6 +2077,7 @@ + @@ -4103,21 +2160,212 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4154,12 +2402,13 @@ + - + @@ -4191,12 +2440,13 @@ + - + @@ -4228,43 +2478,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -4285,16 +2499,16 @@ - - - + + + - + @@ -4302,7 +2516,7 @@ - + @@ -4348,6 +2562,7 @@ + @@ -4385,6 +2600,7 @@ + @@ -4427,6 +2643,7 @@ + @@ -4464,6 +2681,7 @@ + @@ -4492,21 +2710,389 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4538,12 +3124,13 @@ + - + @@ -4575,12 +3162,13 @@ + - + @@ -4612,16 +3200,17 @@ + - + - + @@ -4631,7 +3220,307 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4682,6 +3571,7 @@ + @@ -4719,6 +3609,7 @@ + @@ -4756,6 +3647,7 @@ + @@ -4793,7 +3685,1212 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4839,6 +4936,7 @@ + @@ -4876,6 +4974,7 @@ + @@ -4918,6 +5017,7 @@ + @@ -4955,6 +5055,7 @@ + @@ -4985,7 +5086,7 @@ - + @@ -4995,7 +5096,7 @@ - + @@ -5003,7 +5104,7 @@ - + @@ -5016,7 +5117,7 @@ - + @@ -5026,7 +5127,7 @@ - + @@ -5034,7 +5135,7 @@ - + @@ -5047,7 +5148,7 @@ - + @@ -5057,7 +5158,7 @@ - + @@ -5065,7 +5166,7 @@ - + @@ -5078,7 +5179,7 @@ - + @@ -5088,7 +5189,7 @@ - + @@ -5096,7 +5197,7 @@ - + @@ -5109,7 +5210,7 @@ - + @@ -5119,7 +5220,7 @@ - + @@ -5127,7 +5228,7 @@ - + @@ -5140,7 +5241,7 @@ - + @@ -5150,7 +5251,7 @@ - + @@ -5158,7 +5259,7 @@ - + @@ -5171,7 +5272,7 @@ - + @@ -5181,7 +5282,7 @@ - + @@ -5189,7 +5290,7 @@ - + @@ -5202,7 +5303,7 @@ - + @@ -5212,7 +5313,7 @@ - + @@ -5220,7 +5321,7 @@ - + @@ -5233,7 +5334,7 @@ - + @@ -5243,7 +5344,7 @@ - + @@ -5251,7 +5352,7 @@ - + @@ -5264,7 +5365,7 @@ - + @@ -5274,7 +5375,7 @@ - + @@ -5282,7 +5383,7 @@ - + @@ -5295,7 +5396,7 @@ - + @@ -5305,7 +5406,7 @@ - + @@ -5313,7 +5414,7 @@ - + @@ -5326,7 +5427,7 @@ - + @@ -5336,7 +5437,7 @@ - + @@ -5344,7 +5445,7 @@ - + @@ -5357,7 +5458,7 @@ - + @@ -5367,7 +5468,7 @@ - + @@ -5375,7 +5476,7 @@ - + @@ -5388,7 +5489,7 @@ - + @@ -5398,7 +5499,7 @@ - + @@ -5406,7 +5507,7 @@ - + @@ -5419,7 +5520,7 @@ - + @@ -5429,7 +5530,7 @@ - + @@ -5437,7 +5538,7 @@ - + @@ -5450,7 +5551,7 @@ - + @@ -5460,7 +5561,7 @@ - + @@ -5468,7 +5569,7 @@ - + @@ -5481,7 +5582,7 @@ - + @@ -5491,7 +5592,7 @@ - + @@ -5499,7 +5600,7 @@ - + @@ -5512,7 +5613,7 @@ - + @@ -5522,7 +5623,7 @@ - + @@ -5530,7 +5631,7 @@ - + @@ -5543,7 +5644,7 @@ - + @@ -5553,7 +5654,7 @@ - + @@ -5561,7 +5662,7 @@ - + @@ -5574,7 +5675,7 @@ - + @@ -5584,7 +5685,7 @@ - + @@ -5592,7 +5693,7 @@ - + @@ -5605,7 +5706,7 @@ - + @@ -5615,7 +5716,7 @@ - + @@ -5623,7 +5724,7 @@ - + @@ -5636,7 +5737,7 @@ - + @@ -5646,7 +5747,7 @@ - + @@ -5654,7 +5755,7 @@ - + @@ -5667,7 +5768,7 @@ - + @@ -5677,7 +5778,7 @@ - + @@ -5685,7 +5786,7 @@ - + @@ -5698,7 +5799,7 @@ - + @@ -5708,7 +5809,7 @@ - + @@ -5716,7 +5817,7 @@ - + @@ -5729,7 +5830,7 @@ - + @@ -5739,7 +5840,7 @@ - + @@ -5747,7 +5848,7 @@ - + @@ -5760,7 +5861,7 @@ - + @@ -5770,7 +5871,7 @@ - + @@ -5778,7 +5879,7 @@ - + @@ -5791,7 +5892,7 @@ - + @@ -5801,7 +5902,7 @@ - + @@ -5809,7 +5910,7 @@ - + @@ -5822,7 +5923,7 @@ - + @@ -5832,7 +5933,7 @@ - + @@ -5840,7 +5941,7 @@ - + @@ -5853,7 +5954,7 @@ - + @@ -5863,7 +5964,7 @@ - + @@ -5871,7 +5972,7 @@ - + @@ -5884,7 +5985,7 @@ - + @@ -5894,7 +5995,7 @@ - + @@ -5902,7 +6003,7 @@ - + @@ -5915,7 +6016,7 @@ - + @@ -5925,7 +6026,7 @@ - + @@ -5933,7 +6034,7 @@ - + @@ -5946,7 +6047,7 @@ - + @@ -5956,7 +6057,7 @@ - + @@ -5964,7 +6065,7 @@ - + @@ -5977,7 +6078,7 @@ - + @@ -5987,7 +6088,7 @@ - + @@ -5995,7 +6096,7 @@ - + @@ -6008,7 +6109,7 @@ - + @@ -6018,7 +6119,7 @@ - + @@ -6026,7 +6127,7 @@ - + @@ -6039,7 +6140,7 @@ - + @@ -6049,7 +6150,7 @@ - + @@ -6057,7 +6158,7 @@ - + @@ -6070,7 +6171,7 @@ - + @@ -6080,7 +6181,7 @@ - + @@ -6088,7 +6189,7 @@ - + @@ -6101,7 +6202,7 @@ - + @@ -6111,7 +6212,7 @@ - + @@ -6119,7 +6220,7 @@ - + @@ -6132,7 +6233,7 @@ - + @@ -6142,7 +6243,7 @@ - + @@ -6150,7 +6251,7 @@ - + @@ -6163,7 +6264,7 @@ - + @@ -6173,7 +6274,7 @@ - + @@ -6181,7 +6282,7 @@ - + @@ -6194,7 +6295,7 @@ - + @@ -6204,7 +6305,7 @@ - + @@ -6212,7 +6313,7 @@ - + @@ -6225,7 +6326,7 @@ - + @@ -6235,7 +6336,7 @@ - + @@ -6243,7 +6344,7 @@ - + @@ -6256,7 +6357,7 @@ - + @@ -6266,7 +6367,7 @@ - + @@ -6274,7 +6375,7 @@ - + @@ -6287,7 +6388,7 @@ - + @@ -6297,7 +6398,7 @@ - + @@ -6305,7 +6406,7 @@ - + @@ -6318,7 +6419,7 @@ - + @@ -6328,7 +6429,7 @@ - + @@ -6336,7 +6437,7 @@ - + @@ -6349,7 +6450,7 @@ - + @@ -6359,7 +6460,7 @@ - + @@ -6367,7 +6468,7 @@ - + @@ -6386,7 +6487,7 @@ - + @@ -6394,7 +6495,7 @@ - + @@ -6402,334 +6503,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6740,10 +6514,22 @@ - - + + - + + + + + + + + + + + + + @@ -6751,7 +6537,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6761,6 +6589,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6769,12 +6731,26 @@ - - - - + + + + + + + + + + + + + + + + + + @@ -6793,151 +6769,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -6947,56 +6783,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7008,301 +6794,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -7310,61 +6802,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -7375,10 +6813,22 @@ - - + + - + + + + + + + + + + + + + @@ -7386,7 +6836,133 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7399,14 +6975,254 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7416,6 +7232,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7423,6 +7498,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7430,6 +7531,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7446,38 +7579,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7497,7 +7598,7 @@ - + @@ -7524,14 +7625,15 @@ - + + - + @@ -7558,14 +7660,15 @@ - + + - + @@ -7592,7 +7695,8 @@ - + + diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas index 88e3333298..f4ca23b882 100644 --- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas +++ b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/onpostphysicsupdate.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,1135 +16,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1190,6 +62,7 @@ + @@ -1227,6 +100,7 @@ + @@ -1264,6 +138,7 @@ + @@ -1301,6 +176,7 @@ + @@ -1338,6 +214,7 @@ + @@ -1375,6 +252,7 @@ + @@ -1425,111 +303,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1576,6 +350,7 @@ + @@ -1613,6 +388,7 @@ + @@ -1633,7 +409,657 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1679,6 +1105,7 @@ + @@ -1716,6 +1143,7 @@ + @@ -1753,6 +1181,7 @@ + @@ -1790,6 +1219,7 @@ + @@ -1827,6 +1257,7 @@ + @@ -1869,6 +1300,7 @@ + @@ -1906,6 +1338,7 @@ + @@ -1943,6 +1376,7 @@ + @@ -1980,6 +1414,7 @@ + @@ -2017,6 +1452,7 @@ + @@ -2094,12 +1530,12 @@ - + - + @@ -2145,6 +1581,7 @@ + @@ -2182,6 +1619,7 @@ + @@ -2224,6 +1662,7 @@ + @@ -2261,6 +1700,7 @@ + @@ -2298,6 +1738,7 @@ + @@ -2335,6 +1776,7 @@ + @@ -2372,6 +1814,7 @@ + @@ -2436,11 +1879,618 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -2450,7 +2500,7 @@ - + @@ -2458,7 +2508,7 @@ - + @@ -2471,7 +2521,7 @@ - + @@ -2481,7 +2531,7 @@ - + @@ -2489,7 +2539,7 @@ - + @@ -2502,7 +2552,7 @@ - + @@ -2512,7 +2562,7 @@ - + @@ -2520,7 +2570,7 @@ - + @@ -2533,7 +2583,7 @@ - + @@ -2543,7 +2593,7 @@ - + @@ -2551,7 +2601,7 @@ - + @@ -2564,7 +2614,7 @@ - + @@ -2574,7 +2624,7 @@ - + @@ -2582,7 +2632,7 @@ - + @@ -2595,7 +2645,7 @@ - + @@ -2605,7 +2655,7 @@ - + @@ -2613,7 +2663,7 @@ - + @@ -2626,7 +2676,7 @@ - + @@ -2636,7 +2686,7 @@ - + @@ -2644,7 +2694,7 @@ - + @@ -2657,7 +2707,7 @@ - + @@ -2667,7 +2717,7 @@ - + @@ -2675,7 +2725,7 @@ - + @@ -2688,7 +2738,7 @@ - + @@ -2698,7 +2748,7 @@ - + @@ -2706,7 +2756,7 @@ - + @@ -2719,7 +2769,7 @@ - + @@ -2729,7 +2779,7 @@ - + @@ -2737,7 +2787,7 @@ - + @@ -2750,7 +2800,7 @@ - + @@ -2760,7 +2810,7 @@ - + @@ -2768,7 +2818,7 @@ - + @@ -2781,7 +2831,7 @@ - + @@ -2791,7 +2841,7 @@ - + @@ -2799,7 +2849,7 @@ - + @@ -2812,7 +2862,7 @@ - + @@ -2822,7 +2872,7 @@ - + @@ -2830,7 +2880,7 @@ - + @@ -2843,7 +2893,7 @@ - + @@ -2853,7 +2903,7 @@ - + @@ -2861,7 +2911,7 @@ - + @@ -2880,7 +2930,7 @@ - + @@ -2888,188 +2938,41 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3077,94 +2980,30 @@ - + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3180,27 +3019,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -3208,22 +3027,20 @@ - + - - - - + + + - - - - + + + @@ -3234,15 +3051,17 @@ - - - + + + + - - - + + + + @@ -3250,22 +3069,167 @@ - + - - + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3276,15 +3240,17 @@ - - - + + + + - - - + + + + @@ -3292,43 +3258,127 @@ - + - - - - + + + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3365,7 +3415,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -3377,27 +3447,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -3415,7 +3465,7 @@ - + @@ -3441,6 +3491,7 @@ + diff --git a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas index f49edd0f46..65f10d4f81 100644 --- a/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas +++ b/AutomatedTesting/Levels/Physics/C14902098_ScriptCanvas_PostPhysicsUpdate/ontick.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,295 +16,105 @@ - + - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -312,21 +122,21 @@ - + - + - + - + - + @@ -337,7 +147,7 @@ - + @@ -358,12 +168,13 @@ + - + @@ -374,7 +185,7 @@ - + @@ -395,12 +206,56 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -432,12 +287,13 @@ + - + @@ -469,12 +325,13 @@ + - + @@ -506,12 +363,13 @@ + - + @@ -543,21 +401,38 @@ + + + + + + + + + + + + + + + - + + + - + - + @@ -567,7 +442,7 @@ - + @@ -577,7 +452,7 @@ - + @@ -593,7 +468,304 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -639,6 +811,7 @@ + @@ -676,6 +849,7 @@ + @@ -713,6 +887,7 @@ + @@ -750,6 +925,7 @@ + @@ -787,6 +963,7 @@ + @@ -824,6 +1001,7 @@ + @@ -861,6 +1039,7 @@ + @@ -898,6 +1077,7 @@ + @@ -940,6 +1120,7 @@ + @@ -977,6 +1158,7 @@ + @@ -1056,102 +1238,285 @@ - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -1160,7 +1525,309 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1211,6 +1878,7 @@ + @@ -1248,6 +1916,7 @@ + @@ -1285,6 +1954,7 @@ + @@ -1322,6 +1992,7 @@ + @@ -1357,641 +2028,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2001,7 +2042,7 @@ - + @@ -2009,7 +2050,7 @@ - + @@ -2022,7 +2063,7 @@ - + @@ -2032,7 +2073,7 @@ - + @@ -2040,7 +2081,7 @@ - + @@ -2053,7 +2094,7 @@ - + @@ -2063,7 +2104,7 @@ - + @@ -2071,7 +2112,7 @@ - + @@ -2084,7 +2125,7 @@ - + @@ -2094,7 +2135,7 @@ - + @@ -2102,7 +2143,7 @@ - + @@ -2115,7 +2156,7 @@ - + @@ -2125,7 +2166,7 @@ - + @@ -2133,7 +2174,7 @@ - + @@ -2146,7 +2187,7 @@ - + @@ -2156,7 +2197,7 @@ - + @@ -2164,7 +2205,7 @@ - + @@ -2177,7 +2218,7 @@ - + @@ -2187,7 +2228,7 @@ - + @@ -2195,7 +2236,7 @@ - + @@ -2208,7 +2249,7 @@ - + @@ -2218,7 +2259,7 @@ - + @@ -2226,7 +2267,7 @@ - + @@ -2239,7 +2280,7 @@ - + @@ -2249,7 +2290,7 @@ - + @@ -2257,7 +2298,7 @@ - + @@ -2270,7 +2311,7 @@ - + @@ -2280,7 +2321,7 @@ - + @@ -2288,7 +2329,7 @@ - + @@ -2301,7 +2342,7 @@ - + @@ -2311,7 +2352,7 @@ - + @@ -2319,7 +2360,7 @@ - + @@ -2338,7 +2379,7 @@ - + @@ -2346,41 +2387,41 @@ - + - - - - + + + - - - - + + + - + - - - + + + + - - - + + + + @@ -2388,41 +2429,41 @@ - + - - - - + + + - - - - + + + - + - - - + + + + - - - + + + + @@ -2430,10 +2471,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2449,27 +2552,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -2477,22 +2560,20 @@ - + - - - - + + + - - - - + + + @@ -2503,15 +2584,17 @@ - - - + + + + - - - + + + + @@ -2519,22 +2602,83 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2545,15 +2689,17 @@ - - - + + + + - - - + + + + @@ -2561,146 +2707,41 @@ - + - - - - + + + - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2711,23 +2752,7 @@ - - - - - - - - - - - - - - - - - + @@ -2735,7 +2760,23 @@ - + + + + + + + + + + + + + + + + + @@ -2779,6 +2820,7 @@ + diff --git a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas index ff9fe5c64c..b24a477a2e 100644 --- a/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/C12712455_ScriptCanvas_ShapeCastVerification.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,21 +16,118 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,54 +164,13 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -146,12 +202,13 @@ + - + @@ -183,6 +240,7 @@ + @@ -195,36 +253,24 @@ - + - - - - - - - - - - - - - - + + - + - + @@ -232,16 +278,7 @@ - - - - - - - - - - + @@ -292,6 +329,7 @@ + @@ -334,6 +372,7 @@ + @@ -371,6 +410,7 @@ + @@ -408,6 +448,7 @@ + @@ -457,58 +498,21 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -545,12 +549,56 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -582,12 +630,13 @@ + - + @@ -619,6 +668,7 @@ + @@ -631,24 +681,36 @@ - + + + + + + + + + + + + + - - + + - + - + @@ -656,7 +718,16 @@ - + + + + + + + + + + @@ -702,6 +773,7 @@ + @@ -739,6 +811,7 @@ + @@ -781,6 +854,7 @@ + @@ -823,6 +897,7 @@ + @@ -865,6 +940,7 @@ + @@ -907,6 +983,7 @@ + @@ -949,6 +1026,7 @@ + @@ -991,6 +1069,7 @@ + @@ -1028,6 +1107,7 @@ + @@ -1065,6 +1145,7 @@ + @@ -1102,6 +1183,7 @@ + @@ -1139,6 +1221,7 @@ + @@ -1176,6 +1259,7 @@ + @@ -1213,6 +1297,7 @@ + @@ -1296,334 +1381,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1670,6 +1433,7 @@ + @@ -1712,6 +1476,7 @@ + @@ -1749,6 +1514,7 @@ + @@ -1786,6 +1552,7 @@ + @@ -1868,21 +1635,231 @@ - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1893,7 +1870,7 @@ - + @@ -1914,11 +1891,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + @@ -1926,21 +1963,21 @@ - + - + - + @@ -1977,12 +2014,13 @@ + - + @@ -2019,12 +2057,13 @@ + - + @@ -2056,12 +2095,13 @@ + - + @@ -2093,6 +2133,7 @@ + @@ -2105,7 +2146,7 @@ - + @@ -2144,7 +2185,7 @@ - + @@ -2154,7 +2195,7 @@ - + @@ -2162,7 +2203,7 @@ - + @@ -2175,7 +2216,7 @@ - + @@ -2185,7 +2226,7 @@ - + @@ -2193,7 +2234,7 @@ - + @@ -2206,7 +2247,7 @@ - + @@ -2216,7 +2257,7 @@ - + @@ -2224,7 +2265,7 @@ - + @@ -2237,7 +2278,7 @@ - + @@ -2247,7 +2288,7 @@ - + @@ -2255,7 +2296,7 @@ - + @@ -2268,7 +2309,7 @@ - + @@ -2278,7 +2319,7 @@ - + @@ -2286,7 +2327,7 @@ - + @@ -2299,7 +2340,7 @@ - + @@ -2309,7 +2350,7 @@ - + @@ -2317,7 +2358,7 @@ - + @@ -2330,7 +2371,7 @@ - + @@ -2340,7 +2381,7 @@ - + @@ -2348,7 +2389,7 @@ - + @@ -2361,7 +2402,7 @@ - + @@ -2371,7 +2412,7 @@ - + @@ -2379,7 +2420,7 @@ - + @@ -2392,7 +2433,7 @@ - + @@ -2402,7 +2443,7 @@ - + @@ -2410,7 +2451,7 @@ - + @@ -2429,7 +2470,7 @@ - + @@ -2437,49 +2478,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2492,7 +2491,7 @@ - + @@ -2513,7 +2512,7 @@ - + @@ -2521,27 +2520,15 @@ - + - - - - - - - - - - - - - - + + - + @@ -2552,25 +2539,10 @@ - - + + - - - - - - - - - - - - - - - - + @@ -2580,24 +2552,9 @@ - - - - - - - - - - - - - - - - - - + + + @@ -2605,7 +2562,7 @@ - + @@ -2615,8 +2572,8 @@ - - + + @@ -2626,20 +2583,22 @@ - + - - - + + + + - - - + + + + @@ -2650,17 +2609,15 @@ - - - - + + + - - - - + + + @@ -2668,7 +2625,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2681,51 +2680,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2736,15 +2691,17 @@ - - - + + + + - - - + + + + @@ -2752,7 +2709,7 @@ - + @@ -2760,7 +2717,7 @@ - + @@ -2780,7 +2737,7 @@ - + @@ -2792,25 +2749,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - + + diff --git a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas b/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas index 988184109a..b9f438a4f3 100644 --- a/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/C14195074_ScriptCanvas_PostUpdateEvent.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,868 +16,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -923,6 +62,7 @@ + @@ -960,6 +100,7 @@ + @@ -997,6 +138,7 @@ + @@ -1034,6 +176,7 @@ + @@ -1071,6 +214,7 @@ + @@ -1113,6 +257,7 @@ + @@ -1150,6 +295,7 @@ + @@ -1187,6 +333,7 @@ + @@ -1224,6 +371,7 @@ + @@ -1261,6 +409,7 @@ + @@ -1343,7 +492,885 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1390,6 +1417,7 @@ + @@ -1427,6 +1455,7 @@ + @@ -1513,6 +1542,7 @@ + @@ -1599,6 +1629,7 @@ + @@ -1680,6 +1711,7 @@ + @@ -1720,7 +1752,7 @@ - + @@ -1730,7 +1762,7 @@ - + @@ -1738,7 +1770,7 @@ - + @@ -1751,7 +1783,7 @@ - + @@ -1761,7 +1793,7 @@ - + @@ -1769,7 +1801,7 @@ - + @@ -1782,7 +1814,7 @@ - + @@ -1792,7 +1824,7 @@ - + @@ -1800,7 +1832,7 @@ - + @@ -1813,7 +1845,7 @@ - + @@ -1823,7 +1855,7 @@ - + @@ -1831,7 +1863,7 @@ - + @@ -1844,7 +1876,7 @@ - + @@ -1854,7 +1886,7 @@ - + @@ -1862,7 +1894,7 @@ - + @@ -1875,7 +1907,7 @@ - + @@ -1885,7 +1917,7 @@ - + @@ -1893,7 +1925,7 @@ - + @@ -1906,7 +1938,7 @@ - + @@ -1916,7 +1948,7 @@ - + @@ -1924,7 +1956,7 @@ - + @@ -1937,7 +1969,7 @@ - + @@ -1947,7 +1979,7 @@ - + @@ -1955,7 +1987,7 @@ - + @@ -1974,7 +2006,7 @@ - + @@ -1982,7 +2014,49 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1995,28 +2069,28 @@ - + - + - + - + @@ -2024,62 +2098,46 @@ - + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2087,7 +2145,7 @@ - + @@ -2123,46 +2181,20 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - + @@ -2170,7 +2202,7 @@ - + @@ -2178,27 +2210,27 @@ - + - + - + - + @@ -2212,41 +2244,41 @@ - + - - - - - - - - - - - - - - + + - + - + - - + + - + + + + + + + + + + + + + @@ -2276,7 +2308,7 @@ - + @@ -2284,7 +2316,7 @@ - + @@ -2296,7 +2328,7 @@ - + diff --git a/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas b/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas index a5b927dfc1..7db4f3a35c 100644 --- a/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas +++ b/AutomatedTesting/ScriptCanvas/C14902097_ScriptCanvas_PreUpdateEvent.scriptcanvas @@ -3,7 +3,7 @@ - + @@ -16,163 +16,21 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -209,54 +67,13 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -288,12 +105,51 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -325,6 +181,7 @@ + @@ -337,33 +194,21 @@ - + - - - - - - - - - - - - - + - + @@ -374,7 +219,363 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -421,6 +622,7 @@ + @@ -458,6 +660,7 @@ + @@ -544,6 +747,7 @@ + @@ -630,6 +834,7 @@ + @@ -711,6 +916,7 @@ + @@ -749,72 +955,21 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -824,163 +979,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -994,12 +1077,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1013,22 +1128,8 @@ - - - - - - - - - - - - - - - + @@ -1050,47 +1151,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - + + - + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + @@ -1098,7 +1320,7 @@ - + @@ -1144,6 +1366,7 @@ + @@ -1181,6 +1404,7 @@ + @@ -1218,6 +1442,7 @@ + @@ -1255,6 +1480,7 @@ + @@ -1292,6 +1518,7 @@ + @@ -1334,6 +1561,7 @@ + @@ -1371,6 +1599,7 @@ + @@ -1408,6 +1637,7 @@ + @@ -1445,6 +1675,7 @@ + @@ -1482,6 +1713,7 @@ + @@ -1562,210 +1794,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1775,7 +1808,7 @@ - + @@ -1783,7 +1816,7 @@ - + @@ -1796,7 +1829,7 @@ - + @@ -1806,7 +1839,7 @@ - + @@ -1814,7 +1847,7 @@ - + @@ -1827,7 +1860,7 @@ - + @@ -1837,7 +1870,7 @@ - + @@ -1845,7 +1878,7 @@ - + @@ -1858,7 +1891,7 @@ - + @@ -1868,7 +1901,7 @@ - + @@ -1876,7 +1909,7 @@ - + @@ -1889,7 +1922,7 @@ - + @@ -1899,7 +1932,7 @@ - + @@ -1907,7 +1940,7 @@ - + @@ -1920,7 +1953,7 @@ - + @@ -1930,7 +1963,7 @@ - + @@ -1938,7 +1971,7 @@ - + @@ -1951,7 +1984,7 @@ - + @@ -1961,7 +1994,7 @@ - + @@ -1969,7 +2002,7 @@ - + @@ -1982,7 +2015,7 @@ - + @@ -1992,7 +2025,7 @@ - + @@ -2000,7 +2033,7 @@ - + @@ -2019,7 +2052,7 @@ - + @@ -2027,27 +2060,15 @@ - + - - - - - - - - - - - - - - + + - + @@ -2057,97 +2078,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2155,60 +2085,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - + + + @@ -2216,30 +2102,10 @@ - + - - - - - - - - - - - - - - - - - - - - @@ -2255,7 +2121,27 @@ - + + + + + + + + + + + + + + + + + + + + + @@ -2263,27 +2149,57 @@ - + - - - + + + + - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2293,11 +2209,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2336,15 +2369,7 @@ - - - - - - - - - + @@ -2352,13 +2377,21 @@ - + + + + + + + + + diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Character.h b/Code/Framework/AzFramework/AzFramework/Physics/Character.h index d6f67706f4..19a6cbfe03 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Character.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Character.h @@ -78,7 +78,7 @@ namespace Physics float m_minimumMovementDistance = 0.001f; //!< To avoid jittering, the controller will not attempt to move distances below this. float m_maximumSpeed = 100.0f; //!< If the accumulated requested velocity for a tick exceeds this magnitude, it will be clamped. AZStd::string m_colliderTag; //!< Used to identify the collider associated with the character controller. - AZStd::shared_ptr m_shapeConfig = nullptr; //!< The shape to use when creating the character controller. + AZStd::shared_ptr m_shapeConfig; //!< The shape to use when creating the character controller. AZStd::vector> m_colliders; //!< The list of colliders to attach to the character controller. }; diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h index d892e433bc..ed8a68dc24 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Common/PhysicsSimulatedBody.h @@ -55,7 +55,7 @@ namespace AzPhysics //! Flag to determine if the body is part of the simulation. //! When true the body will be affected by any forces, collisions, and found with scene queries. - bool m_simulating = true; + bool m_simulating = false; //! Helper functions for setting user data. //! @param userData Can be a pointer to any type as internally will be cast to a void*. Object lifetime not managed by the SimulatedBody. diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp index 0e29263e30..01bff3ccbb 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.cpp @@ -46,6 +46,7 @@ namespace AzPhysics ->Field("orientation", &SimulatedBodyConfiguration::m_orientation) ->Field("scale", &SimulatedBodyConfiguration::m_scale) ->Field("entityId", &SimulatedBodyConfiguration::m_entityId) + ->Field("startSimulationEnabled", &SimulatedBodyConfiguration::m_startSimulationEnabled) ; } } diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h index 203590adbb..6862bfccb8 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Configuration/SimulatedBodyConfiguration.h @@ -39,6 +39,7 @@ namespace AzPhysics AZ::Vector3 m_position = AZ::Vector3::CreateZero(); AZ::Quaternion m_orientation = AZ::Quaternion::CreateIdentity(); AZ::Vector3 m_scale = AZ::Vector3::CreateOne(); + bool m_startSimulationEnabled = true; // Entity/object association. AZ::EntityId m_entityId = AZ::EntityId(AZ::EntityId::InvalidEntityId); diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp index 02cd96ac00..f634360445 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp +++ b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.cpp @@ -52,6 +52,11 @@ namespace Physics } } + RagdollConfiguration::RagdollConfiguration() + { + m_startSimulationEnabled = false; //ragdolls do not start enabled. + } + void RagdollConfiguration::Reflect(AZ::ReflectContext* context) { AZ::SerializeContext* serializeContext = azrtti_cast(context); diff --git a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h index 3f98ca9303..239d93cf32 100644 --- a/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h +++ b/Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h @@ -24,6 +24,8 @@ namespace Physics { + using ParentIndices = AZStd::vector; + class RagdollNodeConfiguration : public AzPhysics::RigidBodyConfiguration { @@ -46,7 +48,7 @@ namespace Physics AZ_RTTI(RagdollConfiguration, "{7C96D332-61D8-4C58-A2BF-707716D38D14}", AzPhysics::SimulatedBodyConfiguration); static void Reflect(AZ::ReflectContext* context); - RagdollConfiguration() = default; + RagdollConfiguration(); explicit RagdollConfiguration(const RagdollConfiguration& settings) = default; RagdollNodeConfiguration* FindNodeConfigByName(const AZStd::string& nodeName) const; @@ -56,6 +58,8 @@ namespace Physics AZStd::vector m_nodes; CharacterColliderConfiguration m_colliders; + RagdollState m_initialState; + ParentIndices m_parentIndices; }; /// Represents a single rigid part of a ragdoll. @@ -79,7 +83,7 @@ namespace Physics { public: AZ_CLASS_ALLOCATOR(Ragdoll, AZ::SystemAllocator, 0); - AZ_RTTI(Ragdoll, "{01F09602-80EC-4693-A0E7-C2719239044B}", AzPhysics::SimulatedBody); + AZ_RTTI(Physics::Ragdoll, "{01F09602-80EC-4693-A0E7-C2719239044B}", AzPhysics::SimulatedBody); virtual ~Ragdoll() = default; /// Inserts the ragdoll into the physics simulation. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp index 261645e79a..d2e34c662f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp @@ -63,7 +63,7 @@ AZ_POP_DISABLE_WARNING #include #include -#include +#include namespace AzToolsFramework { @@ -93,15 +93,11 @@ namespace AzToolsFramework setAcceptDrops(true); - m_thumbnail = new Thumbnailer::ThumbnailWidget(this); - m_thumbnail->setFixedSize(QSize(24, 24)); + m_thumbnail = new ThumbnailPropertyCtrl(this); + m_thumbnail->setFixedSize(QSize(40, 24)); m_thumbnail->setVisible(false); - m_thumbnailDropDown = new ThumbnailDropDown(this); - m_thumbnailDropDown->setFixedSize(QSize(40, 24)); - m_thumbnailDropDown->setVisible(false); - - connect(m_thumbnailDropDown, &ThumbnailDropDown::clicked, this, &PropertyAssetCtrl::OnEditButtonClicked); + connect(m_thumbnail, &ThumbnailPropertyCtrl::clicked, this, &PropertyAssetCtrl::OnThumbnailClicked); m_editButton = new QToolButton(this); m_editButton->setAutoRaise(true); @@ -112,7 +108,6 @@ namespace AzToolsFramework connect(m_editButton, &QToolButton::clicked, this, &PropertyAssetCtrl::OnEditButtonClicked); pLayout->addWidget(m_thumbnail); - pLayout->addWidget(m_thumbnailDropDown); pLayout->addWidget(m_browseEdit); pLayout->addWidget(m_editButton); @@ -188,6 +183,17 @@ namespace AzToolsFramework } } + void PropertyAssetCtrl::OnThumbnailClicked() + { + const AZ::Data::AssetId assetID = GetCurrentAssetID(); + if (m_thumbnailCallback) + { + AZ_Error("Asset Property", m_editNotifyTarget, "No notification target set for edit callback."); + m_thumbnailCallback->Invoke(m_editNotifyTarget, assetID, GetCurrentAssetType()); + return; + } + } + void PropertyAssetCtrl::OnCompletionModelReset() { if (!m_completerIsActive) @@ -1091,10 +1097,10 @@ namespace AzToolsFramework void PropertyAssetCtrl::UpdateThumbnail() { m_thumbnail->setVisible(m_showThumbnail); - m_thumbnailDropDown->setVisible(m_showThumbnailDropDown); - if (m_showThumbnail || m_showThumbnailDropDown) + if (m_showThumbnail) { + m_thumbnail->ShowDropDownArrow(m_showThumbnailDropDownButton); const AZ::Data::AssetId assetID = GetCurrentAssetID(); if (assetID.IsValid()) { @@ -1112,17 +1118,12 @@ namespace AzToolsFramework { m_thumbnail->SetThumbnailKey(thumbnailKey, Thumbnailer::ThumbnailContext::DefaultContext); } - if (m_showThumbnailDropDown) - { - m_thumbnailDropDown->SetThumbnailKey(thumbnailKey, Thumbnailer::ThumbnailContext::DefaultContext); - } return; } } } m_thumbnail->ClearThumbnail(); - m_thumbnailDropDown->ClearThumbnail(); } void PropertyAssetCtrl::SetClearButtonEnabled(bool enable) @@ -1156,14 +1157,19 @@ namespace AzToolsFramework return m_showThumbnail; } - void PropertyAssetCtrl::SetShowThumbnailDropDown(bool enable) + void PropertyAssetCtrl::SetShowThumbnailDropDownButton(bool enable) { - m_showThumbnailDropDown = enable; + m_showThumbnailDropDownButton = enable; } - bool PropertyAssetCtrl::GetShowThumbnailDropDown() const + bool PropertyAssetCtrl::GetShowThumbnailDropDownButton() const { - return m_showThumbnailDropDown; + return m_showThumbnailDropDownButton; + } + + void PropertyAssetCtrl::SetThumbnailCallback(EditCallbackType* editNotifyCallback) + { + m_thumbnailCallback = editNotifyCallback; } const AZ::Uuid& AssetPropertyHandlerDefault::GetHandledType() const @@ -1277,23 +1283,21 @@ namespace AzToolsFramework } else if (attrib == AZ_CRC_CE("Thumbnail")) { - bool showThumbnail = false; - if (attrValue->Read(showThumbnail)) - { - GUI->SetShowThumbnail(showThumbnail); - } + GUI->SetShowThumbnail(true); } - else if (attrib == AZ_CRC_CE("ThumbnailWithDropDown")) + else if (attrib == AZ_CRC_CE("ThumbnailCallback")) { PropertyAssetCtrl::EditCallbackType* func = azdynamic_cast(attrValue->GetAttribute()); if (func) { - GUI->SetShowThumbnailDropDown(true); - GUI->SetEditNotifyCallback(func); + GUI->SetShowThumbnail(true); + GUI->SetShowThumbnailDropDownButton(true); + GUI->SetThumbnailCallback(func); } else { - GUI->SetEditNotifyCallback(nullptr); + GUI->SetShowThumbnailDropDownButton(false); + GUI->SetThumbnailCallback(nullptr); } } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx index b1f2dbb529..b28ce3247c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.hxx @@ -45,7 +45,7 @@ namespace AzToolsFramework { class AssetCompleterModel; class AssetCompleterListView; - class ThumbnailDropDown; + class ThumbnailPropertyCtrl; namespace Thumbnailer { @@ -95,8 +95,7 @@ namespace AzToolsFramework void OnAssetIDChanged(AZ::Data::AssetId newAssetID); protected: - ThumbnailDropDown* m_thumbnailDropDown = nullptr; - Thumbnailer::ThumbnailWidget* m_thumbnail = nullptr; + ThumbnailPropertyCtrl* m_thumbnail = nullptr; QPushButton* m_errorButton = nullptr; QToolButton* m_editButton = nullptr; @@ -157,8 +156,8 @@ namespace AzToolsFramework bool m_showProductAssetName = true; bool m_showThumbnail = false; - - bool m_showThumbnailDropDown = false; + bool m_showThumbnailDropDownButton = false; + EditCallbackType* m_thumbnailCallback = nullptr; // ! Default suffix used in the field's placeholder text when a default value is set. const char* m_DefaultSuffix = " (default)"; @@ -209,8 +208,9 @@ namespace AzToolsFramework void SetShowThumbnail(bool enable); bool GetShowThumbnail() const; - void SetShowThumbnailDropDown(bool enable); - bool GetShowThumbnailDropDown() const; + void SetShowThumbnailDropDownButton(bool enable); + bool GetShowThumbnailDropDownButton() const; + void SetThumbnailCallback(EditCallbackType* editNotifyCallback); void SetSelectedAssetID(const AZ::Data::AssetId& newID); void SetCurrentAssetType(const AZ::Data::AssetType& newType); @@ -222,6 +222,7 @@ namespace AzToolsFramework void UpdateAssetDisplay(); void OnLineEditFocus(bool focus); virtual void OnEditButtonClicked(); + void OnThumbnailClicked(); void OnCompletionModelReset(); void OnAutocomplete(const QModelIndex& index); void OnTextChange(const QString& text); diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp similarity index 66% rename from Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.cpp rename to Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp index 8a942a952a..bb9232435a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp @@ -19,12 +19,14 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // 4251: 'QRawFon #include #include #include +#include AZ_POP_DISABLE_WARNING -#include "ThumbnailDropDown.h" +#include "ThumbnailPropertyCtrl.h" namespace AzToolsFramework { - ThumbnailDropDown::ThumbnailDropDown(QWidget* parent) + + ThumbnailPropertyCtrl::ThumbnailPropertyCtrl(QWidget* parent) : QWidget(parent) { QHBoxLayout* pLayout = new QHBoxLayout(); @@ -37,6 +39,7 @@ namespace AzToolsFramework m_dropDownArrow = new AspectRatioAwarePixmapWidget(this); m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0.png")); m_dropDownArrow->setFixedSize(QSize(8, 24)); + ShowDropDownArrow(false); m_emptyThumbnail = new QLabel(this); m_emptyThumbnail->setPixmap(QPixmap(":/stylesheet/img/line.png")); @@ -51,19 +54,33 @@ namespace AzToolsFramework setLayout(pLayout); } - void ThumbnailDropDown::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName) + void ThumbnailPropertyCtrl::SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName) { + m_key = key; m_emptyThumbnail->setVisible(false); m_thumbnail->SetThumbnailKey(key, contextName); } - void ThumbnailDropDown::ClearThumbnail() + void ThumbnailPropertyCtrl::ClearThumbnail() { m_emptyThumbnail->setVisible(true); m_thumbnail->ClearThumbnail(); } - bool ThumbnailDropDown::event(QEvent* e) + void ThumbnailPropertyCtrl::ShowDropDownArrow(bool visible) + { + if (visible) + { + setFixedSize(QSize(40, 24)); + } + else + { + setFixedSize(QSize(24, 24)); + } + m_dropDownArrow->setVisible(visible); + } + + bool ThumbnailPropertyCtrl::event(QEvent* e) { if (isEnabled()) { @@ -77,7 +94,7 @@ namespace AzToolsFramework return QWidget::event(e); } - void ThumbnailDropDown::paintEvent(QPaintEvent* e) + void ThumbnailPropertyCtrl::paintEvent(QPaintEvent* e) { QPainter p(this); QRect targetRect(QPoint(), QSize(40, 24)); @@ -85,17 +102,32 @@ namespace AzToolsFramework QWidget::paintEvent(e); } - void ThumbnailDropDown::enterEvent(QEvent* e) + void ThumbnailPropertyCtrl::enterEvent(QEvent* e) { m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0_highlighted.png")); + if (!m_thumbnailEnlarged && m_key) + { + QPoint position = mapToGlobal(pos() - QPoint(185, 0)); + QSize size(180, 180); + m_thumbnailEnlarged.reset(new Thumbnailer::ThumbnailWidget()); + m_thumbnailEnlarged->setFixedSize(size); + m_thumbnailEnlarged->move(position); + m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint); + m_thumbnailEnlarged->SetThumbnailKey(m_key); + m_thumbnailEnlarged->show(); + } QWidget::enterEvent(e); } - void ThumbnailDropDown::leaveEvent(QEvent* e) + void ThumbnailPropertyCtrl::leaveEvent(QEvent* e) { m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0.png")); + if (m_thumbnailEnlarged) + { + m_thumbnailEnlarged.reset(); + } QWidget::leaveEvent(e); } } -#include "UI/PropertyEditor/moc_ThumbnailDropDown.cpp" +#include "UI/PropertyEditor/moc_ThumbnailPropertyCtrl.cpp" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h similarity index 82% rename from Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.h rename to Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h index da269742ff..428f24dbf6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailDropDown.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h @@ -30,17 +30,20 @@ namespace AzToolsFramework class ThumbnailWidget; } - class ThumbnailDropDown : public QWidget + //! Used by PropertyAssetCtrl to display thumbnail preview of the asset as well as additional drop-down actions + class ThumbnailPropertyCtrl : public QWidget { Q_OBJECT public: - explicit ThumbnailDropDown(QWidget* parent = nullptr); + explicit ThumbnailPropertyCtrl(QWidget* parent = nullptr); //! Call this to set what thumbnail widget will display void SetThumbnailKey(Thumbnailer::SharedThumbnailKey key, const char* contextName = "Default"); //! Remove current thumbnail void ClearThumbnail(); + void ShowDropDownArrow(bool visible); + bool event(QEvent* e) override; Q_SIGNALS: @@ -52,7 +55,9 @@ namespace AzToolsFramework void leaveEvent(QEvent* e) override; private: + Thumbnailer::SharedThumbnailKey m_key; Thumbnailer::ThumbnailWidget* m_thumbnail = nullptr; + QScopedPointer m_thumbnailEnlarged; QLabel* m_emptyThumbnail = nullptr; AspectRatioAwarePixmapWidget* m_dropDownArrow = nullptr; }; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index 2939bb44ad..96eaab3009 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -417,8 +417,8 @@ set(FILES UI/PropertyEditor/GrowTextEdit.cpp UI/PropertyEditor/MultiLineTextEditHandler.h UI/PropertyEditor/MultiLineTextEditHandler.cpp - UI/PropertyEditor/ThumbnailDropDown.h - UI/PropertyEditor/ThumbnailDropDown.cpp + UI/PropertyEditor/ThumbnailPropertyCtrl.h + UI/PropertyEditor/ThumbnailPropertyCtrl.cpp UI/Slice/SlicePushWidget.cpp UI/Slice/SlicePushWidget.hxx UI/Slice/SliceOverridesNotificationWindow.cpp diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp index 69f5d9801a..1df31a2c1d 100644 --- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp +++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp @@ -1,187 +1,64 @@ /* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or -* a third party where indicated. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ + * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates, or + * a third party where indicated. + * + * For complete copyright and license terms please see the LICENSE at the root of this + * distribution (the "License"). All use of this software is governed by the License, + * or, if provided, by the license below or the license accompanying this file. Do not + * remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * + */ #include "EditorDefs.h" #include "PropertyMotionCtrl.h" -// Qt -#include -#include -#include - // AzToolsFramework -#include #include +#include - -MotionPropertyCtrl::MotionPropertyCtrl(QWidget *pParent) - : QWidget(pParent) +QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget* pParent) { - m_motionLabel = new QLabel; - - m_pBrowseButton = new QToolButton; - m_pBrowseButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/file_browse.png")); - m_pApplyButton = new QToolButton; - m_pApplyButton->setIcon(QIcon(":/reflectedPropertyCtrl/img/apply.png")); - - m_pApplyButton->setFocusPolicy(Qt::StrongFocus); - m_pBrowseButton->setFocusPolicy(Qt::StrongFocus); - - QHBoxLayout *pLayout = new QHBoxLayout(this); - pLayout->setContentsMargins(0, 0, 0, 0); - pLayout->addWidget(m_motionLabel, 1); - pLayout->addWidget(m_pBrowseButton); - pLayout->addWidget(m_pApplyButton); - - connect(m_pBrowseButton, &QAbstractButton::clicked, this, &MotionPropertyCtrl::OnBrowseClicked); - connect(m_pApplyButton, &QAbstractButton::clicked, this, &MotionPropertyCtrl::OnApplyClicked); -}; - -MotionPropertyCtrl::~MotionPropertyCtrl() -{ -} - - -void MotionPropertyCtrl::SetValue(const CReflectedVarMotion &motion) -{ - m_motion = motion; - SetLabelText(motion.m_motion); -} - -CReflectedVarMotion MotionPropertyCtrl::value() const -{ - return m_motion; -} - -void MotionPropertyCtrl::OnBrowseClicked() -{ - - static AZ::Data::AssetType emotionFXMotionAssetType("{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem - - // Request the AssetBrowser Dialog and set a type filter - AssetSelectionModel selection = AssetSelectionModel::AssetTypeSelection(emotionFXMotionAssetType); - selection.SetSelectedAssetId(m_motion.m_assetId); - AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection); - if (selection.IsValid()) - { - auto product = azrtti_cast(selection.GetResult()); - if (product != nullptr) - { - m_motion.m_motion = product->GetRelativePath(); - m_motion.m_assetId = product->GetAssetId(); - SetLabelText(m_motion.m_motion); - emit ValueChanged(m_motion); - } - } -} - -// TODO: Might be able to delete this function -void MotionPropertyCtrl::OnApplyClicked() -{ -#if 0 - CUIEnumerations &roGeneralProxy = CUIEnumerations::GetUIEnumerationsInstance(); - QStringList cSelectedMotions; - size_t nTotalMotions(0); - size_t nCurrentMotion(0); - - QString combinedString = GetIEditor()->GetResourceSelectorHost()->GetGlobalSelection("motion"); - SplitString(combinedString, cSelectedMotions, ','); - - nTotalMotions = cSelectedMotions.size(); - for (nCurrentMotion = 0; nCurrentMotion < nTotalMotions; ++nCurrentMotion) - { - QString& rstrCurrentAnimAction = cSelectedMotions[nCurrentMotion]; - if (!rstrCurrentAnimAction.isEmpty()) - { - m_motion.m_motion = rstrCurrentAnimAction.toLatin1().data(); - SetLabelText(m_motion.m_motion); - emit ValueChanged(m_motion); - } - } -#endif -} - -QWidget* MotionPropertyCtrl::GetFirstInTabOrder() -{ - return m_pBrowseButton; -} -QWidget* MotionPropertyCtrl::GetLastInTabOrder() -{ - return m_pApplyButton; -} - -void MotionPropertyCtrl::UpdateTabOrder() -{ - setTabOrder(m_pBrowseButton, m_pApplyButton); -} - -void MotionPropertyCtrl::SetLabelText(const AZStd::string& motion) -{ - if (!motion.empty()) - { - AZStd::string filename; - if (AzFramework::StringFunc::Path::GetFileName(motion.c_str(), filename)) - { - m_motionLabel->setText(filename.c_str()); - } - else - { - m_motionLabel->setText(motion.c_str()); - } - } - else - { - m_motionLabel->setText(""); - } -} - - -QWidget* MotionPropertyWidgetHandler::CreateGUI(QWidget *pParent) -{ - MotionPropertyCtrl* newCtrl = aznew MotionPropertyCtrl(pParent); - connect(newCtrl, &MotionPropertyCtrl::ValueChanged, newCtrl, [newCtrl]() - { - EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl); - }); + AzToolsFramework::PropertyAssetCtrl* newCtrl = aznew AzToolsFramework::PropertyAssetCtrl(pParent); + connect( + newCtrl, &AzToolsFramework::PropertyAssetCtrl::OnAssetIDChanged, this, [newCtrl]([[maybe_unused]] AZ::Data::AssetId newAssetId) { + EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl); + AzToolsFramework::PropertyEditorGUIMessages::Bus::Broadcast( + &AzToolsFramework::PropertyEditorGUIMessages::Bus::Handler::OnEditingFinished, newCtrl); + }); return newCtrl; } - -void MotionPropertyWidgetHandler::ConsumeAttribute(MotionPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) +void MotionPropertyWidgetHandler::ConsumeAttribute( + [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, [[maybe_unused]] AZ::u32 attrib, + [[maybe_unused]] AzToolsFramework::PropertyAttributeReader* attrValue, [[maybe_unused]] const char* debugName) { - Q_UNUSED(GUI); - Q_UNUSED(attrib); - Q_UNUSED(attrValue); - Q_UNUSED(debugName); } -void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty(size_t index, MotionPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) +void MotionPropertyWidgetHandler::WriteGUIValuesIntoProperty( + [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, + [[maybe_unused]] AzToolsFramework::InstanceDataNode* node) { - Q_UNUSED(index); - Q_UNUSED(node); - CReflectedVarMotion val = GUI->value(); + CReflectedVarMotion val; + val.m_motion = GUI->GetCurrentAssetHint(); + val.m_assetId = GUI->GetSelectedAssetID(); instance = static_cast(val); } -bool MotionPropertyWidgetHandler::ReadValuesIntoGUI(size_t index, MotionPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node) +bool MotionPropertyWidgetHandler::ReadValuesIntoGUI( + [[maybe_unused]] size_t index, [[maybe_unused]] AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance, + [[maybe_unused]] AzToolsFramework::InstanceDataNode* node) { - Q_UNUSED(index); - Q_UNUSED(node); - CReflectedVarMotion val = instance; - GUI->SetValue(val); + static const AZ::Data::AssetType emotionFXMotionAssetType( + "{00494B8E-7578-4BA2-8B28-272E90680787}"); // from MotionAsset.h in EMotionFX Gem + + GUI->blockSignals(true); + GUI->SetSelectedAssetID(instance.m_assetId); + GUI->SetCurrentAssetType(emotionFXMotionAssetType); + GUI->blockSignals(false); + return false; } - #include - diff --git a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h index 568111b521..d04f1b3353 100644 --- a/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h +++ b/Code/Sandbox/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h @@ -1,92 +1,67 @@ /* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ + * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or + * its licensors. + * + * For complete copyright and license terms please see the LICENSE at the root of this + * distribution (the "License"). All use of this software is governed by the License, + * or, if provided, by the license below or the license accompanying this file. Do not + * remove or modify any license notices. This file is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * + */ -#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H -#define CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H #pragma once #if !defined(Q_MOC_RUN) -#include -#include #include "ReflectedVar.h" -#include -#include +#include +#include +#include #include - +#include +#include #endif -class QToolButton; -class QLabel; -class QHBoxLayout; - -namespace AzToolsFramework -{ - class PropertyAssetCtrl; -} - -class MotionPropertyCtrl - : public QWidget +class MotionPropertyWidgetHandler : QObject, + public AzToolsFramework::PropertyHandler { Q_OBJECT -public: - AZ_CLASS_ALLOCATOR(MotionPropertyCtrl, AZ::SystemAllocator, 0); - MotionPropertyCtrl(QWidget* pParent = nullptr); - virtual ~MotionPropertyCtrl(); - - CReflectedVarMotion value() const; - - QWidget* GetFirstInTabOrder(); - QWidget* GetLastInTabOrder(); - void UpdateTabOrder(); - -signals: - void ValueChanged(CReflectedVarMotion value); - -public slots: - void SetValue(const CReflectedVarMotion& motion); - -protected slots: - void OnBrowseClicked(); - void OnApplyClicked(); - -private: - void SetLabelText(const AZStd::string& motion); - - QToolButton* m_pBrowseButton; - QToolButton* m_pApplyButton; - QLabel* m_motionLabel; - - CReflectedVarMotion m_motion; -}; - -class MotionPropertyWidgetHandler - : QObject - , public AzToolsFramework::PropertyHandler < CReflectedVarMotion, MotionPropertyCtrl > -{ public: AZ_CLASS_ALLOCATOR(MotionPropertyWidgetHandler, AZ::SystemAllocator, 0); - virtual AZ::u32 GetHandlerName(void) const override { return AZ_CRC("Motion", 0xf5fea1e8); } - virtual bool IsDefaultHandler() const override { return true; } - virtual QWidget* GetFirstInTabOrder(MotionPropertyCtrl* widget) override { return widget->GetFirstInTabOrder(); } - virtual QWidget* GetLastInTabOrder(MotionPropertyCtrl* widget) override { return widget->GetLastInTabOrder(); } - virtual void UpdateWidgetInternalTabbing(MotionPropertyCtrl* widget) override { widget->UpdateTabOrder(); } + virtual AZ::u32 GetHandlerName(void) const override + { + return AZ_CRC("Motion", 0xf5fea1e8); + } + + virtual bool IsDefaultHandler() const override + { + return true; + } + + virtual QWidget* GetFirstInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override + { + return widget->GetFirstInTabOrder(); + } + + virtual QWidget* GetLastInTabOrder(AzToolsFramework::PropertyAssetCtrl* widget) override + { + return widget->GetLastInTabOrder(); + } + + virtual void UpdateWidgetInternalTabbing(AzToolsFramework::PropertyAssetCtrl* widget) override + { + widget->UpdateTabOrder(); + } virtual QWidget* CreateGUI(QWidget* pParent) override; - virtual void ConsumeAttribute(MotionPropertyCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override; - virtual void WriteGUIValuesIntoProperty(size_t index, MotionPropertyCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override; - virtual bool ReadValuesIntoGUI(size_t index, MotionPropertyCtrl* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node) override; + virtual void ConsumeAttribute( + AzToolsFramework::PropertyAssetCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, + const char* debugName) override; + virtual void WriteGUIValuesIntoProperty( + size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override; + virtual bool ReadValuesIntoGUI( + size_t index, AzToolsFramework::PropertyAssetCtrl* GUI, const property_t& instance, + AzToolsFramework::InstanceDataNode* node) override; }; - - -#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYMOTIONCTRL_H diff --git a/Code/Sandbox/Editor/EditorViewportWidget.cpp b/Code/Sandbox/Editor/EditorViewportWidget.cpp index 25588e85a7..9ce567c91e 100644 --- a/Code/Sandbox/Editor/EditorViewportWidget.cpp +++ b/Code/Sandbox/Editor/EditorViewportWidget.cpp @@ -2428,7 +2428,10 @@ void EditorViewportWidget::SetDefaultCamera() return; } ResetToViewSourceType(ViewSourceType::None); - gEnv->p3DEngine->GetPostEffectBaseGroup()->SetParam("Dof_Active", 0.0f); + if (gEnv->p3DEngine) + { + gEnv->p3DEngine->GetPostEffectBaseGroup()->SetParam("Dof_Active", 0.0f); + } GetViewManager()->SetCameraObjectId(m_cameraObjectId); SetName(m_defaultViewName); SetViewTM(m_defaultViewTM); diff --git a/Code/Tools/CMakeLists.txt b/Code/Tools/CMakeLists.txt index 8fa7d3868a..f106034c3c 100644 --- a/Code/Tools/CMakeLists.txt +++ b/Code/Tools/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(SceneAPI) # Needs to go before AssetProcessor since it provides add_subdirectory(AssetProcessor) add_subdirectory(AWSNativeSDKInit) add_subdirectory(AzTestRunner) +add_subdirectory(CrashHandler) add_subdirectory(CryCommonTools) add_subdirectory(CryXML) add_subdirectory(HLSLCrossCompiler) @@ -21,7 +22,6 @@ add_subdirectory(News) add_subdirectory(PythonBindingsExample) add_subdirectory(RC) add_subdirectory(RemoteConsole) -add_subdirectory(CrashHandler) add_subdirectory(ShaderCacheGen) add_subdirectory(DeltaCataloger) add_subdirectory(SerializeContextTools) diff --git a/Code/Tools/CrashHandler/CMakeLists.txt b/Code/Tools/CrashHandler/CMakeLists.txt index 7c8229b8a4..ec41ef7c9e 100644 --- a/Code/Tools/CrashHandler/CMakeLists.txt +++ b/Code/Tools/CrashHandler/CMakeLists.txt @@ -32,11 +32,11 @@ ly_add_target( PRIVATE ${pal_dir} BUILD_DEPENDENCIES + PUBLIC + AZ::CrashSupport PRIVATE 3rdParty::Crashpad - AZ::AzCore AZ::AzFramework - AZ::CrashSupport ) string(REPLACE "." ";" version_list "${LY_VERSION_STRING}") @@ -67,11 +67,9 @@ ly_add_target( PRIVATE Uploader/include/Uploader BUILD_DEPENDENCIES - PRIVATE - AZ::AzCore - AZ::CrashSupport PUBLIC 3rdParty::Crashpad::Handler + AZ::CrashSupport ) add_subdirectory(Tools) diff --git a/Code/Tools/CrashHandler/Support/CMakeLists.txt b/Code/Tools/CrashHandler/Support/CMakeLists.txt index 2445b50db5..c67be28949 100644 --- a/Code/Tools/CrashHandler/Support/CMakeLists.txt +++ b/Code/Tools/CrashHandler/Support/CMakeLists.txt @@ -19,6 +19,6 @@ ly_add_target( PUBLIC include BUILD_DEPENDENCIES - PRIVATE + PUBLIC AZ::AzCore ) diff --git a/Code/Tools/CrashHandler/Tools/CMakeLists.txt b/Code/Tools/CrashHandler/Tools/CMakeLists.txt index 390ff7b07d..d8e29ccbed 100644 --- a/Code/Tools/CrashHandler/Tools/CMakeLists.txt +++ b/Code/Tools/CrashHandler/Tools/CMakeLists.txt @@ -21,13 +21,13 @@ ly_add_target( tools_crash_handler_files.cmake Platform/${PAL_PLATFORM_NAME}/tools_crash_handler_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake INCLUDE_DIRECTORIES - PRIVATE + PUBLIC . BUILD_DEPENDENCIES + PUBLIC + AZ::CrashHandler PRIVATE 3rdParty::Qt::Core - AZ::CrashHandler - AZ::CrashSupport AZ::AzToolsFramework ) @@ -41,18 +41,14 @@ ly_add_target( Platform/${PAL_PLATFORM_NAME}/tools_crash_uploader_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake INCLUDE_DIRECTORIES PRIVATE - . Uploader BUILD_DEPENDENCIES PRIVATE 3rdParty::Qt::Core 3rdParty::Qt::Gui 3rdParty::Qt::Widgets - 3rdParty::Crashpad - 3rdParty::Crashpad::Handler AZ::CrashUploaderSupport AZ::AzQtComponents - AZ::CrashSupport TARGET_PROPERTIES Qt5_NO_LINK_QTMAIN TRUE ) diff --git a/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp index 77c49ad910..57cbfa3369 100644 --- a/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp +++ b/Code/Tools/CrashHandler/Uploader/src/CrashUploader.cpp @@ -138,7 +138,7 @@ namespace O3de if (!logFileReader->Open(thisFile)) { #if defined(AZ_PLATFORM_WINDOWS) - LOG(ERROR) << "Failed to open " << base::UTF16ToUTF8(thisFile.BaseName().value()); + LOG(ERROR) << "Failed to open " << base::WideToUTF8(thisFile.BaseName().value()); #else LOG(ERROR) << "Failed to open " << thisFile.BaseName().value(); #endif @@ -149,7 +149,7 @@ namespace O3de if (start_offset < 0) { #if defined(AZ_PLATFORM_WINDOWS) - LOG(ERROR) << "Failed to get offset for " << base::UTF16ToUTF8(thisFile.BaseName().value()); + LOG(ERROR) << "Failed to get offset for " << base::WideToUTF8(thisFile.BaseName().value()); #else LOG(ERROR) << "Failed to get offset for " << thisFile.BaseName().value(); #endif @@ -162,7 +162,7 @@ namespace O3de std::string fileNameKey{ "attachment_" }; #if defined(AZ_PLATFORM_WINDOWS) - fileNameKey += base::UTF16ToUTF8(thisFile.BaseName().value()); + fileNameKey += base::WideToUTF8(thisFile.BaseName().value()); #else fileNameKey += thisFile.BaseName().value(); #endif diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp b/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp index ef4c390fe0..b6ff2cb66d 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp +++ b/Gems/AtomLyIntegration/AtomBridge/Code/Source/BuilderComponent.cpp @@ -41,7 +41,6 @@ namespace AZ BuilderComponent::~BuilderComponent() { - AZ::Component::~Component(); AZ::Interface::Unregister(this); } diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp index 2f74991756..9d63f4a4a9 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponentSlot.cpp @@ -98,7 +98,7 @@ namespace AZ ->Attribute(AZ::Edit::Attributes::DefaultAsset, &EditorMaterialComponentSlot::GetDefaultAssetId) ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &EditorMaterialComponentSlot::GetLabel) ->Attribute(AZ::Edit::Attributes::ShowProductAssetFileName, true) - ->Attribute("ThumbnailWithDropDown", &EditorMaterialComponentSlot::OpenPopupMenu) + ->Attribute("ThumbnailCallback", &EditorMaterialComponentSlot::OpenPopupMenu) ; } } diff --git a/Gems/CrashReporting/Code/CMakeLists.txt b/Gems/CrashReporting/Code/CMakeLists.txt index dbb78849fb..d52600ea9b 100644 --- a/Gems/CrashReporting/Code/CMakeLists.txt +++ b/Gems/CrashReporting/Code/CMakeLists.txt @@ -30,9 +30,7 @@ ly_add_target( Include BUILD_DEPENDENCIES PRIVATE - AZ::AzCore AZ::CrashHandler - AZ::CrashSupport ) ly_add_target( @@ -46,10 +44,5 @@ ly_add_target( Include BUILD_DEPENDENCIES PRIVATE - #3rdParty::Crashpad - #3rdParty::Crashpad::Handler - AZ::AzCore AZ::CrashUploaderSupport - #AZ::CrashHandler - AZ::CrashSupport ) diff --git a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp index 0a1dd366e6..545dc7d2f9 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp @@ -443,9 +443,12 @@ namespace DebugDraw AZ::TransformBus::EventResult(sphereElement.m_worldLocation, sphereElement.m_targetEntityId, &AZ::TransformBus::Events::GetWorldTranslation); } - ColorB lyColor(sphereElement.m_color.ToU32()); - Vec3 worldLocation(AZVec3ToLYVec3(sphereElement.m_worldLocation)); - gEnv->pRenderer->GetIRenderAuxGeom()->DrawSphere(worldLocation, sphereElement.m_radius, lyColor, true); + if (gEnv->pRenderer) + { + ColorB lyColor(sphereElement.m_color.ToU32()); + Vec3 worldLocation(AZVec3ToLYVec3(sphereElement.m_worldLocation)); + gEnv->pRenderer->GetIRenderAuxGeom()->DrawSphere(worldLocation, sphereElement.m_radius, lyColor, true); + } } removeExpiredDebugElementsFromVector(m_activeSpheres); diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp index 02d286a1d0..3eb4aad119 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Source/BlendTree.cpp @@ -303,7 +303,8 @@ namespace EMotionFX if (GetFinalNode() == nodeToRemove) { - SetFinalNodeId(AnimGraphNodeId::InvalidId); + m_finalNodeId = AnimGraphNodeId::InvalidId; + m_finalNode = nullptr; } // call it for all children diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp index 29dc8a92aa..0f6b084201 100644 --- a/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp +++ b/Gems/LmbrCentral/Code/Source/LmbrCentral.cpp @@ -39,7 +39,6 @@ #include "Rendering/LightComponent.h" #include "Rendering/HighQualityShadowComponent.h" #include "Rendering/MeshComponent.h" -#include "Rendering/FogVolumeComponent.h" #include "Rendering/GeomCacheComponent.h" #include "Ai/NavigationComponent.h" #include "Scripting/TagComponent.h" @@ -241,7 +240,6 @@ namespace LmbrCentral StereoRendererComponent::CreateDescriptor(), NavigationSystemComponent::CreateDescriptor(), GeometrySystemComponent::CreateDescriptor(), - FogVolumeComponent::CreateDescriptor(), RandomTimedSpawnerComponent::CreateDescriptor(), GeometryCacheComponent::CreateDescriptor(), SphereShapeDebugDisplayComponent::CreateDescriptor(), diff --git a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp index c658f5ebb9..b20ce12f35 100644 --- a/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp +++ b/Gems/LmbrCentral/Code/Source/LmbrCentralEditor.cpp @@ -34,7 +34,6 @@ #include "Rendering/EditorEnvProbeComponent.h" #include "Rendering/EditorHighQualityShadowComponent.h" #include "Rendering/EditorMeshComponent.h" -#include "Rendering/EditorFogVolumeComponent.h" #include "Rendering/EditorGeomCacheComponent.h" #include "Scripting/EditorLookAtComponent.h" #include "Scripting/EditorRandomTimedSpawnerComponent.h" @@ -104,7 +103,6 @@ namespace LmbrCentral EditorCommentComponent::CreateDescriptor(), EditorNavigationAreaComponent::CreateDescriptor(), EditorNavigationSeedComponent::CreateDescriptor(), - EditorFogVolumeComponent::CreateDescriptor(), EditorRandomTimedSpawnerComponent::CreateDescriptor(), EditorGeometryCacheComponent::CreateDescriptor(), EditorSpawnerComponent::CreateDescriptor(), diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.cpp deleted file mode 100644 index fcc44ff3cb..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.cpp +++ /dev/null @@ -1,353 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#include "LmbrCentral_precompiled.h" - -#include -#include -#include - -#include -#include - -#include "EditorFogVolumeComponent.h" - -namespace LmbrCentral -{ - void EditorFogVolumeComponent::Activate() - { - Base::Activate(); - - const auto entityId = GetEntityId(); - - m_configuration.SetEntityId(entityId); - m_configuration.UpdateSizeFromEntityShape(); - - m_fogVolume.SetEntityId(entityId); - m_fogVolume.CreateFogVolumeRenderNode(m_configuration); - - RefreshFog(); - - RenderNodeRequestBus::Handler::BusConnect(entityId); - FogVolumeComponentRequestBus::Handler::BusConnect(entityId); - ShapeComponentNotificationsBus::Handler::BusConnect(entityId); - AZ::TransformNotificationBus::Handler::BusConnect(entityId); - AzToolsFramework::EditorEvents::Bus::Handler::BusConnect(); - } - - void EditorFogVolumeComponent::Deactivate() - { - Base::Deactivate(); - - m_fogVolume.DestroyRenderNode(); - m_fogVolume.SetEntityId(AZ::EntityId()); - m_configuration.SetEntityId(AZ::EntityId()); - - AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect(); - AZ::TransformNotificationBus::Handler::BusDisconnect(); - ShapeComponentNotificationsBus::Handler::BusDisconnect(); - FogVolumeComponentRequestBus::Handler::BusDisconnect(); - RenderNodeRequestBus::Handler::BusDisconnect(); - } - - void EditorFogVolumeComponent::Reflect(AZ::ReflectContext* context) - { - AZ::SerializeContext* serializeContext = azrtti_cast(context); - - EditorFogVolumeConfiguration::Reflect(context); - - if (serializeContext) - { - serializeContext->Class() - ->Version(1) - ->Field("FogVolumeConfiguration", &EditorFogVolumeComponent::m_configuration); - - if (AZ::EditContext* editContext = serializeContext->GetEditContext()) - { - editContext->Class( - "Fog Volume", "Allows to specify an area with a fog") - ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::Category, "Environment") - ->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/FogVolume.svg") - ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/FogVolume.png") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c)) - ->Attribute(AZ::Edit::Attributes::HelpPageURL, "http://docs.aws.amazon.com/console/lumberyard/userguide/fog-volume-component") - ->Attribute(AZ::Edit::Attributes::AutoExpand, false) - ->DataElement(0, &EditorFogVolumeComponent::m_configuration, "Settings", "Fog configuration") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly) - ; - } - } - - if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) - { - behaviorContext->Class()->RequestBus("EditorFogVolumeComponentRequestBus"); - FogVolumeComponent::ExposeRequestsBusInBehaviorContext(behaviorContext, "EditorFogVolumeComponentRequestBus"); - } - } - - IRenderNode* EditorFogVolumeComponent::GetRenderNode() - { - return m_fogVolume.GetRenderNode(); - } - - float EditorFogVolumeComponent::GetRenderNodeRequestBusOrder() const - { - return FogVolumeComponent::s_renderNodeRequestBusOrder; - } - - void EditorFogVolumeComponent::RefreshFog() - { - m_fogVolume.UpdateFogVolumeProperties(m_configuration); - m_fogVolume.UpdateRenderingFlags(m_configuration); - m_fogVolume.UpdateFogVolumeTransform(); - } - - void EditorFogVolumeComponent::OnTransformChanged([[maybe_unused]] const AZ::Transform& local, [[maybe_unused]] const AZ::Transform& world) - { - // Entities transform component calls OnTransformChanged before this component is activated - // This only happens during undo operations so we guard against that in the Editor component - if (m_fogVolume.GetRenderNode()) - { - RefreshFog(); - } - } - - void EditorFogVolumeComponent::OnShapeChanged(ShapeComponentNotifications::ShapeChangeReasons changeReason) - { - if (changeReason == ShapeComponentNotifications::ShapeChangeReasons::ShapeChanged) - { - m_configuration.UpdateSizeFromEntityShape(); - RefreshFog(); - } - } - - void EditorFogVolumeComponent::OnEditorSpecChange() - { - RefreshFog(); - } - - void EditorFogVolumeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) - { - return FogVolumeComponent::GetRequiredServices(required); - } - - void EditorFogVolumeComponent::BuildGameEntity(AZ::Entity* gameEntity) - { - FogVolumeComponent* fogComponent = gameEntity->CreateComponent(); - if (fogComponent) - { - fogComponent->SetConfiguration(m_configuration); - } - } - - void EditorFogVolumeConfiguration::Reflect(AZ::ReflectContext * context) - { - if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) - { - serializeContext->Class()-> - Version(1); - - if (AZ::EditContext* editContext = serializeContext->GetEditContext()) - { - editContext->Class("Configuration", "Fog Volume configuration") - - ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly) - - ->DataElement(AZ::Edit::UIHandlers::ComboBox, &FogVolumeConfiguration::m_volumeType, - "Volume type", "Shape of the fog") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->EnumAttribute(FogVolumeType::RectangularPrism, "Cuboid") - ->EnumAttribute(FogVolumeType::Ellipsoid, "Ellipsoid") - - ->DataElement(AZ::Edit::UIHandlers::Color, &FogVolumeConfiguration::m_color, - "Color", "Fog color") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &FogVolumeConfiguration::m_useGlobalFogColor, - "Use global fog color", "If true, the Color property is ignored. Instead, the current global fog color is used") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_globalDensity, - "Fog Density", "Controls the density of the fog. The higher the value the more dense the fog and the less you'll be able to see objects behind or inside the fog volume") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.01f) - ->Attribute(AZ::Edit::Attributes::Max, 1000.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_densityOffset, - "Density offset", "Offset fog density, used in conjunction with the GlobalDensity parameter") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, -1000.0f) - ->Attribute(AZ::Edit::Attributes::Max, 1000.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_nearCutoff, - "Near cutoff", "Stop rendering the object, depending on camera distance to object") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 2.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.1f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_softEdges, - "Soft edges", "Specifies a factor that is used to soften the edges of the fog volume when viewed from outside") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 1.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_windInfluence, - "Wind influence (Volumetric Fog only)", "Controls the influence of the wind (Volumetric Fog only)") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 20.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->ClassElement(AZ::Edit::ClassElements::Group, "Rendering General") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &FogVolumeConfiguration::m_ignoresVisAreas, - "Ignore vis. areas", "Controls whether this entity should respond to visareas") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - - ->DataElement(AZ::Edit::UIHandlers::CheckBox, &FogVolumeConfiguration::m_affectsThisAreaOnly, - "Affect this area only", "Set this parameter to false to make this entity affect in multiple visareas") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - - ->DataElement(0, &FogVolumeConfiguration::m_viewDistMultiplier, - "View distance multiplier", "Adjusts max view distance. If 1.0 then default is used. 1.1 would be 10% further than default.") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Suffix, "x") - ->Attribute(AZ::Edit::Attributes::Min, 0.f) - - ->DataElement(AZ::Edit::UIHandlers::ComboBox, &FogVolumeConfiguration::m_minSpec, - "Minimum spec", "Min spec for the fog to be active.") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->EnumAttribute(EngineSpec::Never, "Never") - ->EnumAttribute(EngineSpec::VeryHigh, "Very high") - ->EnumAttribute(EngineSpec::High, "High") - ->EnumAttribute(EngineSpec::Medium, "Medium") - ->EnumAttribute(EngineSpec::Low, "Low") - - ->ClassElement(AZ::Edit::ClassElements::Group, "") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_hdrDynamic, - "HDR Dynamic (Non-Volumetric Fog)", "Specifies how much brighter than the default 255,255,255 white the fog is (Non-Volumetric Fog only)") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 20.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->ClassElement(AZ::Edit::ClassElements::Group, "Fall Off Settings") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_fallOffDirLong, - "Longitude", "Controls the longitude of the world space fall off direction of the fog. 0 represents East, rotation is counter-clockwise") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 360.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_fallOffDirLatitude, - "Latitude", "Controls the latitude of the world space fall off direction of the fog. 90 lets the fall off direction point upwards in world space") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 360.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_fallOffShift, - "Shift", "Controls how much to shift the fog density distribution along the fall off direction in world units") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, -50.0f) - ->Attribute(AZ::Edit::Attributes::Max, 50.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.1f) - ->Attribute(AZ::Edit::Attributes::Suffix, "m") - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_fallOffScale, - "Scale", "Scales the density distribution along the fall off direction. Higher values will make the fog fall off more rapidly and generate thicker fog layers along the negative fall off direction") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, -50.0f) - ->Attribute(AZ::Edit::Attributes::Max, 50.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->ClassElement(AZ::Edit::ClassElements::Group, "Ramp (Volumetric Fog only)") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_rampStart, - "Start", "Specifies the start distance of fog density ramp in world units") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 30000.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - ->Attribute(AZ::Edit::Attributes::Suffix, "m") - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_rampEnd, - "End", "Specifies the end distance of fog density ramp in world units") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 30000.0f) - ->Attribute(AZ::Edit::Attributes::Step, 1.0f) - ->Attribute(AZ::Edit::Attributes::Suffix, "m") - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_rampInfluence, - "Influence", "Controls the influence of fog density ramp") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 1.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->ClassElement(AZ::Edit::ClassElements::Group, "Density Noise (Volumetric Fog only)") - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_densityNoiseScale, - "Scale", "Scales the noise for the density") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 10.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_densityNoiseOffset, - "Offset", "Offsets the noise for the density") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, -2.0f) - ->Attribute(AZ::Edit::Attributes::Max, 2.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->DataElement(AZ::Edit::UIHandlers::Slider, &FogVolumeConfiguration::m_densityNoiseTimeFrequency, - "Time frequency", "Controls the time frequency of the noise for the density") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 1.0f) - ->Attribute(AZ::Edit::Attributes::Step, 0.01f) - - ->DataElement(AZ::Edit::UIHandlers::Default, &FogVolumeConfiguration::m_densityNoiseFrequency, - "Spatial frequency", "Controls the spatial frequency of the noise for the density") - ->Attribute(AZ::Edit::Attributes::ChangeNotify, &FogVolumeConfiguration::PropertyChanged) - ->Attribute(AZ::Edit::Attributes::Min, 0.0f) - ->Attribute(AZ::Edit::Attributes::Max, 10000.0f) - ; - } - } - } - - AZ::Crc32 EditorFogVolumeConfiguration::PropertyChanged() - { - if (m_entityId.IsValid()) - { - FogVolumeComponentRequestBus::Event(m_entityId, &FogVolumeComponentRequestBus::Events::RefreshFog); - } - return AZ::Edit::PropertyRefreshLevels::None; - } -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.h deleted file mode 100644 index d7b8c3d042..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/EditorFogVolumeComponent.h +++ /dev/null @@ -1,93 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#pragma once - -#include -#include -#include -#include -#include - -#include -#include - -#include "FogVolumeComponent.h" -#include "FogVolumeRequestsHandler.h" - -namespace LmbrCentral -{ - class EditorFogVolumeConfiguration - : public FogVolumeConfiguration - { - public: - AZ_TYPE_INFO(EditorFogVolumeConfiguration, "{9D431EA0-92F9-4A00-96C6-28B189A6EE56}"); - - static void Reflect(AZ::ReflectContext* context); - AZ::Crc32 PropertyChanged() override; - }; - - /** - * In-editor fog volume component. - */ - class EditorFogVolumeComponent - : public AzToolsFramework::Components::EditorComponentBase - , private RenderNodeRequestBus::Handler - , private FogVolumeComponentRequestsBusHandler - , private AZ::TransformNotificationBus::Handler - , private ShapeComponentNotificationsBus::Handler - , private AzToolsFramework::EditorEvents::Bus::Handler - { - private: - using Base = AzToolsFramework::Components::EditorComponentBase; - - public: - AZ_EDITOR_COMPONENT(EditorFogVolumeComponent, "{8CA5AB61-96D8-482F-B07C-DAD72ED73646}"); - - ~EditorFogVolumeComponent() override = default; - - // AZ::Component interface implementation - void Activate() override; - void Deactivate() override; - - static void Reflect(AZ::ReflectContext* context); - - // RenderNodeRequestBus::Handler - IRenderNode* GetRenderNode() override; - float GetRenderNodeRequestBusOrder() const override; - - // FogVolumeComponentRequestBus::Handler - void RefreshFog() override; - - // TransformNotificationBus::Handler - void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override; - - // ShapeComponentNotificationsBus::Handler - void OnShapeChanged(ShapeComponentNotifications::ShapeChangeReasons changeReason) override; - - // AzToolsFramework::EditorEvents::Handler - void OnEditorSpecChange() override; - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - - void BuildGameEntity(AZ::Entity* gameEntity) override; - - protected: - FogVolumeConfiguration& GetConfiguration() override - { - return m_configuration; - } - - private: - EditorFogVolumeConfiguration m_configuration; - FogVolume m_fogVolume; - }; -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.cpp b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.cpp deleted file mode 100644 index 458c76377e..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#include "LmbrCentral_precompiled.h" - -#include -#include -#include -#include - -#include "FogVolumeCommon.h" -#include "FogVolumeComponent.h" - -#include - -namespace LmbrCentral -{ - FogVolume::FogVolume() - : m_fogRenderNode(nullptr) - { - } - - FogVolume::~FogVolume() - { - DestroyRenderNode(); - } - - void FogVolume::CreateFogVolumeRenderNode(const FogVolumeConfiguration& fogVolumeConfig) - { - AZ_Assert(m_entityId.IsValid(), "[FogVolumeCommon/FogVolumeComponent Component] Entity id is invalid"); - DestroyRenderNode(); - - m_fogRenderNode = static_cast(gEnv->p3DEngine->CreateRenderNode(eERType_FogVolume)); - m_fogRenderNode->SetMinSpec(static_cast(fogVolumeConfig.m_minSpec)); - m_fogRenderNode->SetViewDistanceMultiplier(fogVolumeConfig.m_viewDistMultiplier); - - UpdateFogVolumeProperties(fogVolumeConfig); - UpdateFogVolumeTransform(); - } - - void FogVolume::DestroyRenderNode() - { - if (m_fogRenderNode != nullptr) - { - m_fogRenderNode->ReleaseNode(); - m_fogRenderNode = nullptr; - } - } - - void FogVolume::UpdateFogVolumeProperties(const FogVolumeConfiguration& fogVolumeConfig) - { - AZ_Assert(m_fogRenderNode != nullptr, "[FogVolumeCommon/FogVolumeComponent Component] Trying to updated null render node"); - - SFogVolumeProperties fogProperties; - FogUtils::FogConfigToFogParams(fogVolumeConfig, fogProperties); - - m_fogRenderNode->SetFogVolumeProperties(fogProperties); - } - - void FogVolume::UpdateFogVolumeTransform() - { - AZ_Assert(m_fogRenderNode != nullptr, "[FogVolumeCommon/FogVolumeComponent Component] Trying to updated null render node"); - - AZ::Transform parentTransform = AZ::Transform::CreateIdentity(); - AZ::TransformBus::EventResult(parentTransform, m_entityId, &AZ::TransformBus::Events::GetWorldTM); - - m_fogRenderNode->SetScale(AZVec3ToLYVec3(parentTransform.GetScale())); - m_fogRenderNode->SetMatrix(AZTransformToLYTransform(parentTransform)); - } - - void FogVolume::UpdateRenderingFlags(const FogVolumeConfiguration& fogVolumeConfig) - { - if (m_fogRenderNode) - { - m_fogRenderNode->SetMinSpec(static_cast(fogVolumeConfig.m_minSpec)); - - if (gEnv && gEnv->p3DEngine) - { - const int configSpec = gEnv->pSystem->GetConfigSpec(true); - - AZ::u32 rendFlags = static_cast(m_fogRenderNode->GetRndFlags()); - - const bool hidden = static_cast(configSpec) < static_cast(fogVolumeConfig.m_minSpec); - if (hidden) - { - rendFlags |= ERF_HIDDEN; - } - else - { - rendFlags &= ~ERF_HIDDEN; - } - - rendFlags |= ERF_COMPONENT_ENTITY; - m_fogRenderNode->SetRndFlags(rendFlags); - } - } - } - - void FogUtils::FogConfigToFogParams(const LmbrCentral::FogVolumeConfiguration& configuration, SFogVolumeProperties& fogVolumeProperties) - { - AZ_Assert(configuration.m_volumeType != FogVolumeType::None, "[FogConfigToFogParams] Attempting to create a fog with invalid volume type") - - fogVolumeProperties.m_volumeType = static_cast(configuration.m_volumeType); - fogVolumeProperties.m_size = AZVec3ToLYVec3(configuration.m_size); - fogVolumeProperties.m_color = AZColorToLYVec3(configuration.m_color); - fogVolumeProperties.m_useGlobalFogColor = configuration.m_useGlobalFogColor; - fogVolumeProperties.m_ignoresVisAreas = configuration.m_ignoresVisAreas; - fogVolumeProperties.m_affectsThisAreaOnly = configuration.m_affectsThisAreaOnly; - - fogVolumeProperties.m_globalDensity = max(0.01f, configuration.m_globalDensity); - fogVolumeProperties.m_densityOffset = configuration.m_densityOffset; - fogVolumeProperties.m_nearCutoff = configuration.m_nearCutoff; - fogVolumeProperties.m_fHDRDynamic = configuration.m_hdrDynamic; - fogVolumeProperties.m_softEdges = configuration.m_softEdges; - - fogVolumeProperties.m_heightFallOffDirLong = configuration.m_fallOffDirLong; - fogVolumeProperties.m_heightFallOffDirLati = configuration.m_fallOffDirLatitude; - fogVolumeProperties.m_heightFallOffShift = configuration.m_fallOffShift; - fogVolumeProperties.m_heightFallOffScale = configuration.m_fallOffScale; - - fogVolumeProperties.m_rampStart = configuration.m_rampStart; - fogVolumeProperties.m_rampEnd = configuration.m_rampEnd; - fogVolumeProperties.m_rampInfluence = configuration.m_rampInfluence; - fogVolumeProperties.m_windInfluence = configuration.m_windInfluence; - - fogVolumeProperties.m_densityNoiseScale = configuration.m_densityNoiseScale; - fogVolumeProperties.m_densityNoiseOffset = configuration.m_densityNoiseOffset; - fogVolumeProperties.m_densityNoiseTimeFrequency = configuration.m_densityNoiseTimeFrequency; - fogVolumeProperties.m_densityNoiseFrequency = AZVec3ToLYVec3(configuration.m_densityNoiseFrequency); - } - - void FogVolumeConfiguration::Reflect(AZ::ReflectContext * context) - { - if (AZ::SerializeContext *serializeContext = azrtti_cast(context)) - { - serializeContext->Class() - ->Version(1) - ->Field("VolumeType", &FogVolumeConfiguration::m_volumeType) - ->Field("Color", &FogVolumeConfiguration::m_color) - ->Field("HdrDynamic", &FogVolumeConfiguration::m_hdrDynamic) - ->Field("UseGlobalFogColor", &FogVolumeConfiguration::m_useGlobalFogColor) - ->Field("SoftEdges", &FogVolumeConfiguration::m_softEdges) - ->Field("WindInfluence", &FogVolumeConfiguration::m_windInfluence) - ->Field("GlobalDensity", &FogVolumeConfiguration::m_globalDensity) - ->Field("DensityOffset", &FogVolumeConfiguration::m_densityOffset) - ->Field("NearCutoff", &FogVolumeConfiguration::m_nearCutoff) - ->Field("EngineSpec", &FogVolumeConfiguration::m_minSpec) - ->Field("DistMult", &FogVolumeConfiguration::m_viewDistMultiplier) - ->Field("IgnoresVisAreas", &FogVolumeConfiguration::m_ignoresVisAreas) - ->Field("AffectsThisAreaOnly", &FogVolumeConfiguration::m_affectsThisAreaOnly) - ->Field("FallOffDirLong", &FogVolumeConfiguration::m_fallOffDirLong) - ->Field("FallOffDirLatitude", &FogVolumeConfiguration::m_fallOffDirLatitude) - ->Field("FallOffShift", &FogVolumeConfiguration::m_fallOffShift) - ->Field("FallOffScale", &FogVolumeConfiguration::m_fallOffScale) - ->Field("RampStart", &FogVolumeConfiguration::m_rampStart) - ->Field("RampEnd", &FogVolumeConfiguration::m_rampEnd) - ->Field("RampInfluence", &FogVolumeConfiguration::m_rampInfluence) - ->Field("DensityNoiseScale", &FogVolumeConfiguration::m_densityNoiseScale) - ->Field("DensityNoiseOffset", &FogVolumeConfiguration::m_densityNoiseOffset) - ->Field("DensityNoiseTimeFrequency", &FogVolumeConfiguration::m_densityNoiseTimeFrequency) - ->Field("DensityNoiseFrequency", &FogVolumeConfiguration::m_densityNoiseFrequency) - ; - } - } - - void FogVolumeConfiguration::UpdateSizeFromEntityShape() - { - AZ_Assert(m_entityId.IsValid(), "[FogVolumeConfiguration] Entity id is invalid"); - BoxShapeComponentRequestsBus::EventResult(m_size, m_entityId, &BoxShapeComponentRequestsBus::Events::GetBoxDimensions); - } -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.h b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.h deleted file mode 100644 index aba73d1165..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeCommon.h +++ /dev/null @@ -1,116 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#pragma once - -#include -#include -#include - -#include - -struct SFogVolumeProperties; -struct IFogVolumeRenderNode; - -namespace LmbrCentral -{ - /** - * Stores configuration settings for the Fog Volume. - */ - class FogVolumeConfiguration - { - public: - AZ_TYPE_INFO(FogVolumeConfiguration, "{3B786BBB-0B1D-4EF2-9181-CC75C783C26E}"); - virtual ~FogVolumeConfiguration() {}; - - static void Reflect(AZ::ReflectContext* context); - - // Universal rendering properties - EngineSpec m_minSpec = EngineSpec::Low; - float m_viewDistMultiplier = 1.0f; - - FogVolumeType m_volumeType = FogVolumeType::Ellipsoid; - AZ::Color m_color = AZ::Color(1.f, 1.f, 1.f, 1.f); - // Size is not reflected: taken from BoxShape - AZ::Vector3 m_size = AZ::Vector3(1.0f, 1.0f, 1.0f); - - float m_hdrDynamic = false; - bool m_useGlobalFogColor = false; - - float m_globalDensity = 1.0f; - float m_densityOffset = 0.0f; - float m_nearCutoff = 0.0f; - - float m_fallOffDirLong = 0.0f; - float m_fallOffDirLatitude = 90.0f; - float m_fallOffShift = 0.0f; - float m_fallOffScale = 1.0f; - - float m_softEdges = 1.0f; - - float m_rampStart = 1.0f; - float m_rampEnd = 50.0f; - float m_rampInfluence = 0.0f; - float m_windInfluence = 1.0f; - - float m_densityNoiseScale = 1.0f; - float m_densityNoiseOffset = 1.0f; - float m_densityNoiseTimeFrequency = 0.0f; - - AZ::Vector3 m_densityNoiseFrequency = AZ::Vector3(10.0f, 10.0f, 10.0f); - bool m_ignoresVisAreas = false; - bool m_affectsThisAreaOnly = 0.0f; - - void UpdateSizeFromEntityShape(); - - // Implemented in EditorFogVolumeConfiguration - virtual AZ::Crc32 PropertyChanged() { return 0; } - - void SetEntityId(AZ::EntityId id) { m_entityId = id; } - - protected: - // Not reflected - AZ::EntityId m_entityId; - }; - - class FogVolume - { - public: - FogVolume(); - FogVolume(const FogVolume&) = delete; - FogVolume& operator= (const FogVolume&) = delete; - - virtual ~FogVolume(); - - void SetEntityId(AZ::EntityId id) { m_entityId = id; } - - void CreateFogVolumeRenderNode(const FogVolumeConfiguration& fogVolumeConfig); - void DestroyRenderNode(); - - IFogVolumeRenderNode* GetRenderNode() const - { - return m_fogRenderNode; - } - - void UpdateFogVolumeProperties(const FogVolumeConfiguration& fogVolumeConfig); - void UpdateRenderingFlags(const FogVolumeConfiguration& fogVolumeConfig); - void UpdateFogVolumeTransform(); - - private: - IFogVolumeRenderNode* m_fogRenderNode; - AZ::EntityId m_entityId; - }; - - namespace FogUtils - { - void FogConfigToFogParams(const LmbrCentral::FogVolumeConfiguration& configuration, SFogVolumeProperties& fogVolumeProperties); - } -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.cpp b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.cpp deleted file mode 100644 index 865bba6c12..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.cpp +++ /dev/null @@ -1,203 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#include "LmbrCentral_precompiled.h" - -#include -#include -#include - -#include "FogVolumeComponent.h" - -namespace LmbrCentral -{ - const float FogVolumeComponent::s_renderNodeRequestBusOrder = 500.f; - - void FogVolumeComponent::Activate() - { - const auto entityId = GetEntityId(); - - m_configuration.SetEntityId(entityId); - m_configuration.UpdateSizeFromEntityShape(); - - m_fogVolume.SetEntityId(entityId); - m_fogVolume.CreateFogVolumeRenderNode(m_configuration); - - RefreshFog(); - - RenderNodeRequestBus::Handler::BusConnect(entityId); - FogVolumeComponentRequestBus::Handler::BusConnect(entityId); - ShapeComponentNotificationsBus::Handler::BusConnect(entityId); - AZ::TransformNotificationBus::Handler::BusConnect(entityId); - } - - void FogVolumeComponent::Deactivate() - { - m_fogVolume.DestroyRenderNode(); - m_fogVolume.SetEntityId(AZ::EntityId()); - m_configuration.SetEntityId(AZ::EntityId()); - - RenderNodeRequestBus::Handler::BusDisconnect(); - FogVolumeComponentRequestBus::Handler::BusDisconnect(); - ShapeComponentNotificationsBus::Handler::BusDisconnect(); - AZ::TransformNotificationBus::Handler::BusDisconnect(); - } - - void FogVolumeComponent::Reflect(AZ::ReflectContext* context) - { - FogVolumeConfiguration::Reflect(context); - - if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) - { - serializeContext->Class() - ->Version(1) - ->Field("FogVolumeConfiguration", &FogVolumeComponent::m_configuration); - } - - if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) - { - behaviorContext->Class()->RequestBus("FogVolumeComponentRequestBus"); - FogVolumeComponent::ExposeRequestsBusInBehaviorContext(behaviorContext, "FogVolumeComponentRequestBus"); - } - } - - IRenderNode* FogVolumeComponent::GetRenderNode() - { - return m_fogVolume.GetRenderNode(); - } - - float FogVolumeComponent::GetRenderNodeRequestBusOrder() const - { - return s_renderNodeRequestBusOrder; - } - - void FogVolumeComponent::RefreshFog() - { - m_fogVolume.UpdateFogVolumeProperties(m_configuration); - m_fogVolume.UpdateRenderingFlags(m_configuration); - m_fogVolume.UpdateFogVolumeTransform(); - } - - void FogVolumeComponent::OnTransformChanged([[maybe_unused]] const AZ::Transform & local, [[maybe_unused]] const AZ::Transform & world) - { - RefreshFog(); - } - - void FogVolumeComponent::OnShapeChanged(ShapeComponentNotifications::ShapeChangeReasons changeReason) - { - if (changeReason == ShapeComponentNotifications::ShapeChangeReasons::ShapeChanged) - { - m_configuration.UpdateSizeFromEntityShape(); - RefreshFog(); - } - } - - void FogVolumeComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType & required) - { - required.push_back(AZ_CRC("BoxShapeService", 0x946a0032)); - } - - void FogVolumeComponent::ExposeRequestsBusInBehaviorContext(AZ::BehaviorContext* behaviorContext, const char* name) - { - behaviorContext->EBus(name) - ->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::All) - ->Event("RefreshFog", &FogVolumeComponentRequestBus::Events::RefreshFog) - - ->Event("GetVolumeType", &FogVolumeComponentRequestBus::Events::GetVolumeType) - ->Event("SetVolumeType", &FogVolumeComponentRequestBus::Events::SetVolumeType) - ->VirtualProperty("VolumeType", "GetVolumeType", "SetVolumeType") - - ->Event("GetColor", &FogVolumeComponentRequestBus::Events::GetColor) - ->Event("SetColor", &FogVolumeComponentRequestBus::Events::SetColor) - ->VirtualProperty("Color", "GetColor", "SetColor") - - ->Event("GetHdrDynamic", &FogVolumeComponentRequestBus::Events::GetHdrDynamic) - ->Event("SetHdrDynamic", &FogVolumeComponentRequestBus::Events::SetHdrDynamic) - ->VirtualProperty("HdrDynamic", "GetHdrDynamic", "SetHdrDynamic") - - ->Event("GetUseGlobalFogColor", &FogVolumeComponentRequestBus::Events::GetUseGlobalFogColor) - ->Event("SetUseGlobalFogColor", &FogVolumeComponentRequestBus::Events::SetUseGlobalFogColor) - ->VirtualProperty("UseGlobalFogColor", "GetUseGlobalFogColor", "SetUseGlobalFogColor") - - ->Event("GetGlobalDensity", &FogVolumeComponentRequestBus::Events::GetGlobalDensity) - ->Event("SetGlobalDensity", &FogVolumeComponentRequestBus::Events::SetGlobalDensity) - ->VirtualProperty("GlobalDensity", "GetGlobalDensity", "SetGlobalDensity") - - ->Event("GetDensityOffset", &FogVolumeComponentRequestBus::Events::GetDensityOffset) - ->Event("SetDensityOffset", &FogVolumeComponentRequestBus::Events::SetDensityOffset) - ->VirtualProperty("DensityOffset", "GetDensityOffset", "SetDensityOffset") - - ->Event("GetNearCutoff", &FogVolumeComponentRequestBus::Events::GetNearCutoff) - ->Event("SetNearCutoff", &FogVolumeComponentRequestBus::Events::SetNearCutoff) - ->VirtualProperty("NearCutoff", "GetNearCutoff", "SetNearCutoff") - - ->Event("GetFallOffDirLong", &FogVolumeComponentRequestBus::Events::GetFallOffDirLong) - ->Event("SetFallOffDirLong", &FogVolumeComponentRequestBus::Events::SetFallOffDirLong) - ->VirtualProperty("FallOffDirLong", "GetFallOffDirLong", "SetFallOffDirLong") - - ->Event("GetFallOffDirLatitude", &FogVolumeComponentRequestBus::Events::GetFallOffDirLatitude) - ->Event("SetFallOffDirLatitude", &FogVolumeComponentRequestBus::Events::SetFallOffDirLatitude) - ->VirtualProperty("FallOffDirLatitude", "GetFallOffDirLatitude", "SetFallOffDirLatitude") - - ->Event("GetFallOffShift", &FogVolumeComponentRequestBus::Events::GetFallOffShift) - ->Event("SetFallOffShift", &FogVolumeComponentRequestBus::Events::SetFallOffShift) - ->VirtualProperty("FallOffShift", "GetFallOffShift", "SetFallOffShift") - - ->Event("GetFallOffScale", &FogVolumeComponentRequestBus::Events::GetFallOffScale) - ->Event("SetFallOffScale", &FogVolumeComponentRequestBus::Events::SetFallOffScale) - ->VirtualProperty("FallOffScale", "GetFallOffScale", "SetFallOffScale") - - ->Event("GetSoftEdges", &FogVolumeComponentRequestBus::Events::GetSoftEdges) - ->Event("SetSoftEdges", &FogVolumeComponentRequestBus::Events::SetSoftEdges) - ->VirtualProperty("SoftEdges", "GetSoftEdges", "SetSoftEdges") - - ->Event("GetRampStart", &FogVolumeComponentRequestBus::Events::GetRampStart) - ->Event("SetRampStart", &FogVolumeComponentRequestBus::Events::SetRampStart) - ->VirtualProperty("RampStart", "GetRampStart", "SetRampStart") - - ->Event("GetRampEnd", &FogVolumeComponentRequestBus::Events::GetRampEnd) - ->Event("SetRampEnd", &FogVolumeComponentRequestBus::Events::SetRampEnd) - ->VirtualProperty("RampEnd", "GetRampEnd", "SetRampEnd") - - ->Event("GetRampInfluence", &FogVolumeComponentRequestBus::Events::GetRampInfluence) - ->Event("SetRampInfluence", &FogVolumeComponentRequestBus::Events::SetRampInfluence) - ->VirtualProperty("RampInfluence", "GetRampInfluence", "SetRampInfluence") - - ->Event("GetWindInfluence", &FogVolumeComponentRequestBus::Events::GetWindInfluence) - ->Event("SetWindInfluence", &FogVolumeComponentRequestBus::Events::SetWindInfluence) - ->VirtualProperty("WindInfluence", "GetWindInfluence", "SetWindInfluence") - - ->Event("GetDensityNoiseScale", &FogVolumeComponentRequestBus::Events::GetDensityNoiseScale) - ->Event("SetDensityNoiseScale", &FogVolumeComponentRequestBus::Events::SetDensityNoiseScale) - ->VirtualProperty("DensityNoiseScale", "GetDensityNoiseScale", "SetDensityNoiseScale") - - ->Event("GetDensityNoiseOffset", &FogVolumeComponentRequestBus::Events::GetDensityNoiseOffset) - ->Event("SetDensityNoiseOffset", &FogVolumeComponentRequestBus::Events::SetDensityNoiseOffset) - ->VirtualProperty("DensityNoiseOffset", "GetDensityNoiseOffset", "SetDensityNoiseOffset") - - ->Event("GetDensityNoiseTimeFrequency", &FogVolumeComponentRequestBus::Events::GetDensityNoiseTimeFrequency) - ->Event("SetDensityNoiseTimeFrequency", &FogVolumeComponentRequestBus::Events::SetDensityNoiseTimeFrequency) - ->VirtualProperty("DensityNoiseTimeFrequency", "GetDensityNoiseTimeFrequency", "SetDensityNoiseTimeFrequency") - - ->Event("GetDensityNoiseFrequency", &FogVolumeComponentRequestBus::Events::GetDensityNoiseFrequency) - ->Event("SetDensityNoiseFrequency", &FogVolumeComponentRequestBus::Events::SetDensityNoiseFrequency) - ->VirtualProperty("DensityNoiseFrequency", "GetDensityNoiseFrequency", "SetDensityNoiseFrequency") - - ->Event("GetIgnoresVisAreas", &FogVolumeComponentRequestBus::Events::GetIgnoresVisAreas) - ->Event("SetIgnoresVisAreas", &FogVolumeComponentRequestBus::Events::SetIgnoresVisAreas) - ->VirtualProperty("IgnoresVisAreas", "GetIgnoresVisAreas", "SetIgnoresVisAreas") - - ->Event("GetAffectsThisAreaOnly", &FogVolumeComponentRequestBus::Events::GetAffectsThisAreaOnly) - ->Event("SetAffectsThisAreaOnly", &FogVolumeComponentRequestBus::Events::SetAffectsThisAreaOnly) - ->VirtualProperty("AffectsThisAreaOnly", "GetAffectsThisAreaOnly", "SetAffectsThisAreaOnly") - ; - } -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.h b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.h deleted file mode 100644 index a43deb7cf9..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeComponent.h +++ /dev/null @@ -1,84 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#pragma once - -#include - -#include -#include -#include -#include - -#include -#include - -#include - -#include "FogVolumeCommon.h" -#include "FogVolumeRequestsHandler.h" - -namespace LmbrCentral -{ - /*! - * In-game Fog Volume component. - */ - class FogVolumeComponent - : public AZ::Component - , public RenderNodeRequestBus::Handler - , private FogVolumeComponentRequestsBusHandler - , private AZ::TransformNotificationBus::Handler - , private ShapeComponentNotificationsBus::Handler - { - public: - AZ_COMPONENT(FogVolumeComponent, "{C01B9E8F-C015-46AC-9065-79445CE1408A}"); - ~FogVolumeComponent() override = default; - - template - void SetConfiguration(T&& configuration) - { - m_configuration = AZStd::forward(configuration); - } - - // AZ::Component interface implementation - void Activate() override; - void Deactivate() override; - - static void Reflect(AZ::ReflectContext* context); - - // RenderNodeRequestBus::Handler interface implementation - IRenderNode* GetRenderNode() override; - float GetRenderNodeRequestBusOrder() const override; - static const float s_renderNodeRequestBusOrder; - - // TransformNotificationBus::Handler - void OnTransformChanged(const AZ::Transform& local, const AZ::Transform& world) override; - - // ShapeComponentNotificationsBus::Handler - void OnShapeChanged(ShapeComponentNotifications::ShapeChangeReasons changeReason) override; - - // FogVolumeComponentRequestBus::Handler - void RefreshFog() override; - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - static void ExposeRequestsBusInBehaviorContext(AZ::BehaviorContext* behaviorContext, const char* name); - - protected: - FogVolumeConfiguration& GetConfiguration() override - { - return m_configuration; - } - - private: - FogVolumeConfiguration m_configuration; - FogVolume m_fogVolume; - }; -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.cpp b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.cpp deleted file mode 100644 index 9b23481659..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.cpp +++ /dev/null @@ -1,264 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#include "LmbrCentral_precompiled.h" - -#include "FogVolumeRequestsHandler.h" -#include "FogVolumeCommon.h" - -namespace LmbrCentral -{ - FogVolumeType FogVolumeComponentRequestsBusHandler::GetVolumeType() - { - return GetConfiguration().m_volumeType; - } - - void FogVolumeComponentRequestsBusHandler::SetVolumeType(FogVolumeType volumeType) - { - auto& configuration = GetConfiguration(); - if (configuration.m_volumeType != volumeType) - { - configuration.m_volumeType = volumeType; - RefreshFog(); - } - } - - AZ::Color FogVolumeComponentRequestsBusHandler::GetColor() - { - return GetConfiguration().m_color; - } - - void FogVolumeComponentRequestsBusHandler::SetColor(AZ::Color color) - { - GetConfiguration().m_color = color; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetHdrDynamic() - { - return GetConfiguration().m_hdrDynamic; - } - - void FogVolumeComponentRequestsBusHandler::SetHdrDynamic(float hdrDynamic) - { - GetConfiguration().m_hdrDynamic = hdrDynamic; - RefreshFog(); - } - - bool FogVolumeComponentRequestsBusHandler::GetUseGlobalFogColor() - { - return GetConfiguration().m_useGlobalFogColor; - } - - void FogVolumeComponentRequestsBusHandler::SetUseGlobalFogColor(bool useGlobalFogColor) - { - GetConfiguration().m_useGlobalFogColor = useGlobalFogColor; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetGlobalDensity() - { - return GetConfiguration().m_globalDensity; - } - - void FogVolumeComponentRequestsBusHandler::SetGlobalDensity(float globalDensity) - { - GetConfiguration().m_globalDensity = globalDensity; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetDensityOffset() - { - return GetConfiguration().m_densityOffset; - } - - void FogVolumeComponentRequestsBusHandler::SetDensityOffset(float densityOffset) - { - GetConfiguration().m_densityOffset = densityOffset; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetNearCutoff() - { - return GetConfiguration().m_nearCutoff; - } - - void FogVolumeComponentRequestsBusHandler::SetNearCutoff(float nearCutoff) - { - GetConfiguration().m_nearCutoff = nearCutoff; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetFallOffDirLong() - { - return GetConfiguration().m_fallOffDirLong; - } - - void FogVolumeComponentRequestsBusHandler::SetFallOffDirLong(float fallOffDirLong) - { - GetConfiguration().m_fallOffDirLong = fallOffDirLong; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetFallOffDirLatitude() - { - return GetConfiguration().m_fallOffDirLatitude; - } - - void FogVolumeComponentRequestsBusHandler::SetFallOffDirLatitude(float fallOffDirLatitude) - { - GetConfiguration().m_fallOffDirLatitude = fallOffDirLatitude; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetFallOffShift() - { - return GetConfiguration().m_fallOffShift; - } - - void FogVolumeComponentRequestsBusHandler::SetFallOffShift(float fallOffShift) - { - GetConfiguration().m_fallOffShift = fallOffShift; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetFallOffScale() - { - return GetConfiguration().m_fallOffScale; - } - - void FogVolumeComponentRequestsBusHandler::SetFallOffScale(float fallOffScale) - { - GetConfiguration().m_fallOffScale = fallOffScale; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetSoftEdges() - { - return GetConfiguration().m_softEdges; - } - - void FogVolumeComponentRequestsBusHandler::SetSoftEdges(float softEdges) - { - GetConfiguration().m_softEdges = softEdges; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetRampStart() - { - return GetConfiguration().m_rampStart; - } - - void FogVolumeComponentRequestsBusHandler::SetRampStart(float rampStart) - { - GetConfiguration().m_rampStart = rampStart; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetRampEnd() - { - return GetConfiguration().m_rampEnd; - } - - void FogVolumeComponentRequestsBusHandler::SetRampEnd(float rampEnd) - { - GetConfiguration().m_rampEnd = rampEnd; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetRampInfluence() - { - return GetConfiguration().m_rampInfluence; - } - - void FogVolumeComponentRequestsBusHandler::SetRampInfluence(float rampInfluence) - { - GetConfiguration().m_rampInfluence = rampInfluence; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetWindInfluence() - { - return GetConfiguration().m_windInfluence; - } - - void FogVolumeComponentRequestsBusHandler::SetWindInfluence(float windInfluence) - { - GetConfiguration().m_windInfluence = windInfluence; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetDensityNoiseScale() - { - return GetConfiguration().m_densityNoiseScale; - } - - void FogVolumeComponentRequestsBusHandler::SetDensityNoiseScale(float densityNoiseScale) - { - GetConfiguration().m_densityNoiseScale = densityNoiseScale; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetDensityNoiseOffset() - { - return GetConfiguration().m_densityNoiseOffset; - } - - void FogVolumeComponentRequestsBusHandler::SetDensityNoiseOffset(float densityNoiseOffset) - { - GetConfiguration().m_densityNoiseOffset = densityNoiseOffset; - RefreshFog(); - } - - float FogVolumeComponentRequestsBusHandler::GetDensityNoiseTimeFrequency() - { - return GetConfiguration().m_densityNoiseTimeFrequency; - } - - void FogVolumeComponentRequestsBusHandler::SetDensityNoiseTimeFrequency(float timeFrequency) - { - GetConfiguration().m_densityNoiseTimeFrequency = timeFrequency; - RefreshFog(); - } - - AZ::Vector3 FogVolumeComponentRequestsBusHandler::GetDensityNoiseFrequency() - { - return GetConfiguration().m_densityNoiseFrequency; - } - - void FogVolumeComponentRequestsBusHandler::SetDensityNoiseFrequency(AZ::Vector3 densityNoiseFrequency) - { - GetConfiguration().m_densityNoiseFrequency = densityNoiseFrequency; - RefreshFog(); - } - - bool FogVolumeComponentRequestsBusHandler::GetIgnoresVisAreas() - { - return GetConfiguration().m_ignoresVisAreas; - } - - void FogVolumeComponentRequestsBusHandler::SetIgnoresVisAreas(bool ignoresVisAreas) - { - GetConfiguration().m_ignoresVisAreas = ignoresVisAreas; - RefreshFog(); - } - - bool FogVolumeComponentRequestsBusHandler::GetAffectsThisAreaOnly() - { - return GetConfiguration().m_affectsThisAreaOnly; - } - - void FogVolumeComponentRequestsBusHandler::SetAffectsThisAreaOnly(bool affectsThisAreaOnly) - { - GetConfiguration().m_affectsThisAreaOnly = affectsThisAreaOnly; - RefreshFog(); - } -} diff --git a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.h b/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.h deleted file mode 100644 index 1c164e6edf..0000000000 --- a/Gems/LmbrCentral/Code/Source/Rendering/FogVolumeRequestsHandler.h +++ /dev/null @@ -1,94 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#pragma once - -#include -#include - -namespace LmbrCentral -{ - class FogVolumeComponentRequestsBusHandler - : public FogVolumeComponentRequestBus::Handler - { - ///////////////////////////////////////////// - // FogVolumeComponentRequestBus::Handler - FogVolumeType GetVolumeType() override; - void SetVolumeType(FogVolumeType volumeType) override; - - AZ::Color GetColor() override; - void SetColor(AZ::Color color) override; - - float GetHdrDynamic() override; - void SetHdrDynamic(float hdrDynamic) override; - - bool GetUseGlobalFogColor() override; - void SetUseGlobalFogColor(bool useGlobalFogColor) override; - - float GetGlobalDensity() override; - void SetGlobalDensity(float globalDensity) override; - - float GetDensityOffset() override; - void SetDensityOffset(float densityOffset) override; - - float GetNearCutoff() override; - void SetNearCutoff(float nearCutoff) override; - - float GetFallOffDirLong() override; - void SetFallOffDirLong(float fallOffDirLong) override; - - float GetFallOffDirLatitude() override; - void SetFallOffDirLatitude(float fallOffDirLatitude) override; - - float GetFallOffShift() override; - void SetFallOffShift(float fallOffShift) override; - - float GetFallOffScale() override; - void SetFallOffScale(float fallOffScale) override; - - float GetSoftEdges() override; - void SetSoftEdges(float softEdges) override; - - float GetRampStart() override; - void SetRampStart(float rampStart) override; - - float GetRampEnd() override; - void SetRampEnd(float rampEnd) override; - - float GetRampInfluence() override; - void SetRampInfluence(float rampInfluence) override; - - float GetWindInfluence() override; - void SetWindInfluence(float windInfluence) override; - - float GetDensityNoiseScale() override; - void SetDensityNoiseScale(float densityNoiseScale) override; - - float GetDensityNoiseOffset() override; - void SetDensityNoiseOffset(float densityNoiseOffset) override; - - float GetDensityNoiseTimeFrequency() override; - void SetDensityNoiseTimeFrequency(float timeFrequency) override; - - AZ::Vector3 GetDensityNoiseFrequency() override; - void SetDensityNoiseFrequency(AZ::Vector3 densityNoiseFrequency) override; - - bool GetIgnoresVisAreas() override; - void SetIgnoresVisAreas(bool ignoresVisAreas) override; - - bool GetAffectsThisAreaOnly() override; - void SetAffectsThisAreaOnly(bool affectsThisAreaOnly) override; - ///////////////////////////////////////////// - - protected: - virtual FogVolumeConfiguration& GetConfiguration() = 0; - }; -} diff --git a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/FogVolumeComponentBus.h b/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/FogVolumeComponentBus.h deleted file mode 100644 index 55a1d1d039..0000000000 --- a/Gems/LmbrCentral/Code/include/LmbrCentral/Rendering/FogVolumeComponentBus.h +++ /dev/null @@ -1,247 +0,0 @@ -/* -* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or -* its licensors. -* -* For complete copyright and license terms please see the LICENSE at the root of this -* distribution (the "License"). All use of this software is governed by the License, -* or, if provided, by the license below or the license accompanying this file. Do not -* remove or modify any license notices. This file is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* -*/ -#pragma once - -#include - -namespace LmbrCentral -{ - class FogVolumeConfiguration; - - enum class FogVolumeType : AZ::s32 - { - None = -1, - Ellipsoid = 0, - RectangularPrism = 1, - }; - - class FogVolumeComponentRequests - : public AZ::ComponentBus - { - public: - virtual ~FogVolumeComponentRequests() {} - - /// Propagates updated configuration to the fog volume component - virtual void RefreshFog() {}; - - /** - * Gets the volume shape type. - */ - virtual FogVolumeType GetVolumeType() { return FogVolumeType::None; } - /** - * Sets the volume shape type. - */ - virtual void SetVolumeType([[maybe_unused]] FogVolumeType volumeType) {}; - - /** - * Gets color of the fog. - */ - virtual AZ::Color GetColor() { return AZ::Color::CreateOne(); } - /** - * Sets color of the fog. - */ - virtual void SetColor([[maybe_unused]] AZ::Color color) {}; - - /** - * Gets HDR Dynamic. - */ - virtual float GetHdrDynamic() { return FLT_MAX; } - /** - * Set HDR Dynamic. - */ - virtual void SetHdrDynamic([[maybe_unused]] float hdrDynamic) {}; - - /** - * Returns true if global fog color is used instead of the color property. - */ - virtual bool GetUseGlobalFogColor() { return false; } - /** - * Sets whether global fog color is used instead of the color property. - */ - virtual void SetUseGlobalFogColor([[maybe_unused]] bool useGlobalFogColor) {}; - - /** - * Gets Fog density. - */ - virtual float GetGlobalDensity() { return FLT_MAX; } - /** - * Sets Fog density. Fog density controls how thick the fog appears. - */ - virtual void SetGlobalDensity([[maybe_unused]] float globalDensity) {}; - - /** - * Gets density offset - */ - virtual float GetDensityOffset() { return FLT_MAX; } - /** - * Sets density offset. Density offset additionaly controls to the density of the fog volume. - */ - virtual void SetDensityOffset([[maybe_unused]] float densityOffset) {}; - - /** - * Gets near cutoff distance - */ - virtual float GetNearCutoff() { return FLT_MAX; } - /** - * Sets near cutoff distance. Stops rendering the volume, depending on the camera distance to the object (m). - */ - virtual void SetNearCutoff([[maybe_unused]] float nearCutoff) {}; - - /** - * Gets fall off direction horizontally. - */ - virtual float GetFallOffDirLong() { return FLT_MAX; } - /** - * Sets fall off direction horizontally. - */ - virtual void SetFallOffDirLong([[maybe_unused]] float fallOffDirLong) {}; - - /** - * Gets vertical fall off direction. - */ - virtual float GetFallOffDirLatitude() { return FLT_MAX; } - /** - * Sets vertical fall off direction. Controls the latitude of the world space fall off direction of the fog. - * A value of 90 degrees lets the fall off direction point upwards in world space (respectively, -90° points downwards). - */ - virtual void SetFallOffDirLatitude([[maybe_unused]] float fallOffDirLatitude) {}; - - /** - * Gets fall off shift. - */ - virtual float GetFallOffShift() { return FLT_MAX; } - /** - * Sets fall off shift. Controls how much to shift the fog density along the fall off direction. - * Positive values will move thicker fog layers along the fall off direction into the fog volume. - * Negative values will move thick layers along the negative fall off direction out of the fog volume. - */ - virtual void SetFallOffShift([[maybe_unused]] float fallOffShift) {}; - - /** - * Gets the scale of density distribution along the fall off direction. - */ - virtual float GetFallOffScale() { return FLT_MAX; } - /** - * Sets the scale of the density distribution along the fall off direction. Higher values will make the fog fall off more rapidly. - */ - virtual void SetFallOffScale([[maybe_unused]] float fallOffScale) {}; - - /** - * Gets a factor that is used to soften the edges of the fog volume when viewed from outside. - */ - virtual float GetSoftEdges() { return FLT_MAX; } - /** - * Sets a factor that is used to soften the edges of the fog volume when viewed from outside. - */ - virtual void SetSoftEdges([[maybe_unused]] float softEdges) {}; - - /** - * Gets the start distance of fog density ramp in world units (m) Only works with Volumetric Fog. - */ - virtual float GetRampStart() { return FLT_MAX; } - /** - * Sets the start distance of fog density ramp in world units (m) Only works with Volumetric Fog. - */ - virtual void SetRampStart([[maybe_unused]] float rampStart) {}; - - /** - * Gets the end distance of fog density ramp in world units (m). Only works with Volumetric Fog. - */ - virtual float GetRampEnd() { return FLT_MAX; } - /** - * Sets the end distance of fog density ramp in world units (m). Only works with Volumetric Fog. - */ - virtual void SetRampEnd([[maybe_unused]] float rampEnd) {}; - - /** - * Gets the influence of fog density ramp. Only works with Volumetric Fog. - */ - virtual float GetRampInfluence() { return FLT_MAX; } - /** - * Sets the influence of fog density ramp. Only works with Volumetric Fog. - */ - virtual void SetRampInfluence([[maybe_unused]] float rampInfluence) {}; - - /** - * Gets the influence of the global wind upon the fog volume. Only works with Volumetric Fog. - */ - virtual float GetWindInfluence() { return FLT_MAX; } - /** - * Sets the influence of the global wind upon the fog volume. Only works with Volumetric Fog. - */ - virtual void SetWindInfluence([[maybe_unused]] float windInfluence) {}; - - /** - * Gets the scale of the noise value for the density. Only works with Volumetric Fog. - */ - virtual float GetDensityNoiseScale() { return FLT_MAX; } - /** - * Sets the scale of the noise value for the density. This will define the thickness of the individual patches of fog (clouds), - * or if you look at it from the other direction it will define how big the spaces are in-between each cloud. Reducing the value - * will thin out the cloud density and increase the spacing between each cloud. - * Only works with Volumetric Fog. - */ - virtual void SetDensityNoiseScale([[maybe_unused]] float densityNoiseScale) {}; - - /** - * Gets the offset of the noise value for the density. Only works with Volumetric Fog. - */ - virtual float GetDensityNoiseOffset() { return FLT_MAX; } - /** - * Sets the offset of the noise value for the density. Noise breaks up the solid shape of the fog volume into patches. - * Only works with Volumetric Fog. - */ - virtual void SetDensityNoiseOffset([[maybe_unused]] float densityNoiseOffset) {}; - - /** - * Gets the time frequency of the noise for the density. High frequencies produce fast changing fog. Allows the individual fog patches to morph into - * different shapes during the course of their lifetime. Keep this value low otherwise they will morph too quickly and will look very unnatural - */ - virtual float GetDensityNoiseTimeFrequency() { return FLT_MAX; } - /** - * Sets the time frequency of the noise for the density. High frequencies produce fast changing fog. Only works with Volumetric Fog. - */ - virtual void SetDensityNoiseTimeFrequency([[maybe_unused]] float timeFrequency) {}; - - /** - * Gets the spatial frequency of the noise for the density. - */ - virtual AZ::Vector3 GetDensityNoiseFrequency() { return AZ::Vector3::CreateOne(); } - /** - * Sets the spatial frequency of the noise for the density. Allows defining how many fog patches are there. - * Increasing Z value will create a layered effect within the volume simulating different fog patches stacked on top of each other. - * Adding higher values in X & Y would mean there would be more individual fog patches within the volume. - * Only works with Volumetric Fog - */ - virtual void SetDensityNoiseFrequency([[maybe_unused]] AZ::Vector3 densityNoiseFrequency) {}; - - /** - * Returns true if the FogVolume entity should respond to VisAreas and ClipVolumes. - */ - virtual bool GetIgnoresVisAreas() { return false; }; - /** - * Sets whether the FogVolume entity should respond to VisAreas and ClipVolumes. - */ - virtual void SetIgnoresVisAreas([[maybe_unused]] bool ignoresVisAreas) {}; - - /** - * Returns true if the FogVolume entity effect doesn't occur in multiple VisAreas and ClipVolumes. - */ - virtual bool GetAffectsThisAreaOnly() { return false; }; - /** - * Sets whether the FogVolume entity effect doesn't occur in multiple VisAreas and ClipVolumes. - */ - virtual void SetAffectsThisAreaOnly([[maybe_unused]] bool affectsThisAreaOnly) {}; - }; - - using FogVolumeComponentRequestBus = AZ::EBus; -} diff --git a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake index a7dcc8f770..ab245a07f4 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_editor_files.cmake @@ -58,8 +58,6 @@ set(FILES Source/Rendering/EditorMeshComponent.cpp Source/Rendering/EditorHighQualityShadowComponent.h Source/Rendering/EditorHighQualityShadowComponent.cpp - Source/Rendering/EditorFogVolumeComponent.h - Source/Rendering/EditorFogVolumeComponent.cpp Source/Rendering/EditorGeomCacheComponent.h Source/Rendering/EditorGeomCacheComponent.cpp Source/Scripting/EditorLookAtComponent.h diff --git a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake index ba0330e93c..d0df6c7dd0 100644 --- a/Gems/LmbrCentral/Code/lmbrcentral_files.cmake +++ b/Gems/LmbrCentral/Code/lmbrcentral_files.cmake @@ -45,7 +45,6 @@ set(FILES include/LmbrCentral/Rendering/MeshComponentBus.h include/LmbrCentral/Rendering/MeshModificationBus.h include/LmbrCentral/Rendering/RenderNodeBus.h - include/LmbrCentral/Rendering/FogVolumeComponentBus.h include/LmbrCentral/Rendering/HighQualityShadowComponentBus.h include/LmbrCentral/Rendering/GeomCacheComponentBus.h include/LmbrCentral/Rendering/GiRegistrationBus.h @@ -115,12 +114,6 @@ set(FILES Source/Rendering/LightInstance.h Source/Rendering/LightInstance.cpp Source/Rendering/MaterialHandle.cpp - Source/Rendering/FogVolumeComponent.h - Source/Rendering/FogVolumeComponent.cpp - Source/Rendering/FogVolumeCommon.h - Source/Rendering/FogVolumeCommon.cpp - Source/Rendering/FogVolumeRequestsHandler.h - Source/Rendering/FogVolumeRequestsHandler.cpp Source/Rendering/MeshAssetHandler.h Source/Rendering/MeshAssetHandler.cpp Source/Rendering/MeshComponent.h diff --git a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp index 0baa385f44..c295eca188 100644 --- a/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp +++ b/Gems/NvCloth/Code/Source/Components/ClothComponentMesh/ActorClothSkinning.cpp @@ -10,15 +10,13 @@ * */ -#include // Needed for DualQuat -#include - #include #include // Needed to access the Mesh information inside Actor. #include #include +#include #include #include @@ -171,7 +169,7 @@ namespace NvCloth return transformData->GetSkinningMatrices(); } - AZStd::unordered_map ObtainSkinningDualQuaternions( + AZStd::unordered_map ObtainSkinningDualQuaternions( AZ::EntityId entityId, const AZStd::vector& jointIndices) { @@ -181,10 +179,10 @@ namespace NvCloth return {}; } - AZStd::unordered_map skinningDualQuaternions; + AZStd::unordered_map skinningDualQuaternions; for (AZ::u16 jointIndex : jointIndices) { - skinningDualQuaternions.emplace(jointIndex, AZMatrix3x4ToLYMatrix3x4(skinningMatrices[jointIndex])); + skinningDualQuaternions.emplace(jointIndex, MCore::DualQuaternion(AZ::Transform::CreateFromMatrix3x4(skinningMatrices[jointIndex]))); } return skinningDualQuaternions; } @@ -276,8 +274,8 @@ namespace NvCloth AZ::Vector3 ComputeSkinningVector(const AZ::Vector3& originalVector) override; private: - AZStd::unordered_map m_skinningDualQuaternions; - DualQuat m_vertexSkinningTransform = DualQuat(type_identity::IDENTITY); + AZStd::unordered_map m_skinningDualQuaternions; + MCore::DualQuaternion m_vertexSkinningTransform; }; void ActorClothSkinningDualQuaternion::UpdateSkinning() @@ -294,7 +292,7 @@ namespace NvCloth void ActorClothSkinningDualQuaternion::ComputeVertexSkinnningTransform(const SkinningInfo& skinningInfo) { - m_vertexSkinningTransform = DualQuat(type_zero::ZERO); + m_vertexSkinningTransform = MCore::DualQuaternion(AZ::Quaternion::CreateZero(), AZ::Quaternion::CreateZero()); for (size_t weightIndex = 0; weightIndex < skinningInfo.m_jointWeights.size(); ++weightIndex) { const AZ::u16 jointIndex = skinningInfo.m_jointIndices[weightIndex]; @@ -312,12 +310,12 @@ namespace NvCloth AZ::Vector3 ActorClothSkinningDualQuaternion::ComputeSkinningPosition(const AZ::Vector3& originalPosition) { - return LYVec3ToAZVec3(m_vertexSkinningTransform * AZVec3ToLYVec3(originalPosition)); + return m_vertexSkinningTransform.TransformPoint(originalPosition); } AZ::Vector3 ActorClothSkinningDualQuaternion::ComputeSkinningVector(const AZ::Vector3& originalVector) { - return LYVec3ToAZVec3(m_vertexSkinningTransform.nq * AZVec3ToLYVec3(originalVector)).GetNormalized(); + return m_vertexSkinningTransform.TransformVector(originalVector).GetNormalized(); } AZStd::unique_ptr ActorClothSkinning::Create( diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp index 6523238430..d1502a0c65 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.cpp @@ -167,19 +167,18 @@ namespace PhysX return aznew CharacterController(pxController, AZStd::move(callbackManager), scene->GetSceneHandle()); } - AZStd::unique_ptr CreateRagdoll(Physics::RagdollConfiguration& configuration, - const Physics::RagdollState& initialState, const ParentIndices& parentIndices, AzPhysics::SceneHandle sceneHandle) + Ragdoll* CreateRagdoll(Physics::RagdollConfiguration& configuration, AzPhysics::SceneHandle sceneHandle) { const size_t numNodes = configuration.m_nodes.size(); - if (numNodes != initialState.size()) + if (numNodes != configuration.m_initialState.size()) { AZ_Error("PhysX Ragdoll", false, "Mismatch between number of nodes in ragdoll configuration (%i) " - "and number of nodes in the initial ragdoll state (%i)", numNodes, initialState.size()); + "and number of nodes in the initial ragdoll state (%i)", numNodes, configuration.m_initialState.size()); return nullptr; } AZStd::unique_ptr ragdoll = AZStd::make_unique(sceneHandle); - ragdoll->SetParentIndices(parentIndices); + ragdoll->SetParentIndices(configuration.m_parentIndices); auto* sceneInterface = AZ::Interface::Get(); if (sceneInterface == nullptr) @@ -192,15 +191,21 @@ namespace PhysX for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) { Physics::RagdollNodeConfiguration& nodeConfig = configuration.m_nodes[nodeIndex]; - const Physics::RagdollNodeState& nodeState = initialState[nodeIndex]; + const Physics::RagdollNodeState& nodeState = configuration.m_initialState[nodeIndex]; Physics::CharacterColliderNodeConfiguration* colliderNodeConfig = configuration.m_colliders.FindNodeConfigByName(nodeConfig.m_debugName); if (colliderNodeConfig) { AZStd::vector> shapes; - for (const auto& shapeConfig : colliderNodeConfig->m_shapes) + for (const auto& [colliderConfig, shapeConfig] : colliderNodeConfig->m_shapes) { - if (auto shape = AZStd::make_shared(*shapeConfig.first, *shapeConfig.second)) + if (colliderConfig == nullptr || shapeConfig == nullptr) + { + AZ_Error("PhysX Ragdoll", false, "Failed to create collider shape for ragdoll node %s", nodeConfig.m_debugName.c_str()); + return nullptr; + } + + if (auto shape = AZStd::make_shared(*colliderConfig, *shapeConfig)) { shapes.emplace_back(shape); } @@ -212,22 +217,20 @@ namespace PhysX } nodeConfig.m_colliderAndShapeData = shapes; } + nodeConfig.m_startSimulationEnabled = false; + nodeConfig.m_position = nodeState.m_position; + nodeConfig.m_orientation = nodeState.m_orientation; - AzPhysics::SimulatedBodyHandle newBodyHandle = sceneInterface->AddSimulatedBody(sceneHandle, &nodeConfig); - if (newBodyHandle == AzPhysics::InvalidSimulatedBodyHandle) + AZStd::unique_ptr node = AZStd::make_unique(sceneHandle, nodeConfig); + if (node->GetRigidBodyHandle() != AzPhysics::InvalidSimulatedBodyHandle) + { + ragdoll->AddNode(AZStd::move(node)); + } + else { AZ_Error("PhysX Ragdoll", false, "Failed to create rigid body for ragdoll node %s", nodeConfig.m_debugName.c_str()); - return nullptr; + node.reset(); } - sceneInterface->DisableSimulationOfBody(sceneHandle, newBodyHandle); - auto* rigidBody = azdynamic_cast(sceneInterface->GetSimulatedBodyFromHandle(sceneHandle, newBodyHandle)); - - physx::PxRigidDynamic* pxRigidDynamic = static_cast(rigidBody->GetNativePointer()); - physx::PxTransform transform(PxMathConvert(nodeState.m_position), PxMathConvert(nodeState.m_orientation)); - pxRigidDynamic->setGlobalPose(transform); - - AZStd::unique_ptr node = AZStd::make_unique(rigidBody, newBodyHandle); - ragdoll->AddNode(AZStd::move(node)); } // Set up joints. Needs a second pass because child nodes in the ragdoll config aren't guaranteed to have @@ -235,7 +238,7 @@ namespace PhysX size_t rootIndex = SIZE_MAX; for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) { - size_t parentIndex = parentIndices[nodeIndex]; + size_t parentIndex = configuration.m_parentIndices[nodeIndex]; if (parentIndex < numNodes) { physx::PxRigidDynamic* parentActor = ragdoll->GetPxRigidDynamic(parentIndex); @@ -301,8 +304,8 @@ namespace PhysX } ragdoll->SetRootIndex(rootIndex); - - return ragdoll; + + return ragdoll.release(); } physx::PxD6JointDrive CreateD6JointDrive(float stiffness, float dampingRatio, float forceLimit) diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h index 07aa4008d3..e919426457 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/CharacterUtils.h @@ -40,11 +40,8 @@ namespace PhysX //! Creates a ragdoll based on the specified setup and initial pose. //! @param configuration Information about collider geometry and joint setup required to initialize the ragdoll. - //! @param initialState Initial settings for the positions, orientations and velocities of the ragdoll nodes. - //! @param parentIndices Identifies the parent ragdoll node for each node in the ragdoll. //! @param sceneHandle A handle to the physics scene in which the ragdoll should be created. - AZStd::unique_ptr CreateRagdoll(Physics::RagdollConfiguration& configuration, - const Physics::RagdollState& initialState, const ParentIndices& parentIndices, AzPhysics::SceneHandle sceneHandle); + Ragdoll* CreateRagdoll(Physics::RagdollConfiguration& configuration, AzPhysics::SceneHandle sceneHandle); //! Creates a joint drive with properties based on the input values. //! The input values are validated and the damping ratio is used to calculate the damping value used internally. diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp index 72cb511e21..5249781e31 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.cpp @@ -45,7 +45,7 @@ namespace PhysX AZ::SerializeContext* serializeContext = azrtti_cast(context); if (serializeContext) { - serializeContext->Class() + serializeContext->Class() ->Version(1) ; } @@ -56,7 +56,7 @@ namespace PhysX m_nodes.push_back(AZStd::move(node)); } - void Ragdoll::SetParentIndices(const ParentIndices& parentIndices) + void Ragdoll::SetParentIndices(const Physics::ParentIndices& parentIndices) { m_parentIndices = parentIndices; } @@ -109,7 +109,6 @@ namespace PhysX this->ApplyQueuedDisableSimulation(); }) { - m_simulating = false; m_sceneOwner = sceneHandle; } @@ -117,14 +116,7 @@ namespace PhysX { m_sceneStartSimHandler.Disconnect(); - if (auto* sceneInterface = AZ::Interface::Get()) - { - const size_t numNodes = m_nodes.size(); - for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) - { - sceneInterface->RemoveSimulatedBody(m_sceneOwner, m_nodes[nodeIndex]->GetRigidBodyHandle()); - } - } + m_nodes.clear(); //the nodes destructor will remove the simulated body from the scene. } void Ragdoll::ApplyQueuedEnableSimulation() @@ -204,7 +196,6 @@ namespace PhysX sceneInterface->EnableSimulationOfBody(m_sceneOwner, m_nodes[nodeIndex]->GetRigidBodyHandle()); } - else { AZ_Error("PhysX Ragdoll", false, "Invalid PhysX actor for node index %i", nodeIndex); @@ -222,8 +213,7 @@ namespace PhysX } sceneInterface->RegisterSceneSimulationStartHandler(m_sceneOwner, m_sceneStartSimHandler); - - m_simulating = true; + sceneInterface->EnableSimulationOfBody(m_sceneOwner, m_bodyHandle); } void Ragdoll::EnableSimulationQueued(const Physics::RagdollState& initialState) @@ -276,7 +266,7 @@ namespace PhysX } } - m_simulating = false; + sceneInterface->DisableSimulationOfBody(m_sceneOwner, m_bodyHandle); } void Ragdoll::DisableSimulationQueued() diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h index 46bae6648b..7bf807bcc5 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/Ragdoll.h @@ -19,8 +19,6 @@ namespace PhysX { - using ParentIndices = AZStd::vector; - /// PhysX specific implementation of generic physics API Ragdoll class. class Ragdoll : public Physics::Ragdoll @@ -29,7 +27,7 @@ namespace PhysX friend class RagdollComponent; AZ_CLASS_ALLOCATOR(Ragdoll, AZ::SystemAllocator, 0); - AZ_TYPE_INFO_LEGACY(PhysX::Ragdoll, "{55D477B5-B922-4D3E-89FE-7FB7B9FDD635}", Physics::Ragdoll); + AZ_RTTI(PhysX::Ragdoll, "{55D477B5-B922-4D3E-89FE-7FB7B9FDD635}", Physics::Ragdoll); static void Reflect(AZ::ReflectContext* context); Ragdoll() = default; @@ -38,7 +36,7 @@ namespace PhysX ~Ragdoll(); void AddNode(AZStd::unique_ptr node); - void SetParentIndices(const ParentIndices& parentIndices); + void SetParentIndices(const Physics::ParentIndices& parentIndices); void SetRootIndex(size_t nodeIndex); physx::PxRigidDynamic* GetPxRigidDynamic(size_t nodeIndex) const; physx::PxTransform GetRootPxTransform() const; @@ -75,7 +73,7 @@ namespace PhysX void ApplyQueuedDisableSimulation(); AZStd::vector> m_nodes; - ParentIndices m_parentIndices; + Physics::ParentIndices m_parentIndices; AZ::Outcome m_rootIndex = AZ::Failure(); /// Queued initial state for the ragdoll, for EnableSimulationQueued, to be applied prior to the world update. diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp index 63d62144f8..6e3b97212b 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.cpp @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -30,14 +31,14 @@ namespace PhysX } } - RagdollNode::RagdollNode(AzPhysics::RigidBody* rigidBody, AzPhysics::SimulatedBodyHandle rigidBodyHandle) - : m_rigidBody(rigidBody) - , m_rigidBodyHandle(rigidBodyHandle) + RagdollNode::RagdollNode(AzPhysics::SceneHandle sceneHandle, Physics::RagdollNodeConfiguration& nodeConfig) { - physx::PxRigidDynamic* pxRigidDynamic = static_cast(m_rigidBody->GetNativePointer()); - m_actorUserData = PhysX::ActorData(pxRigidDynamic); - m_actorUserData.SetRagdollNode(this); - m_actorUserData.SetEntityId(m_rigidBody->GetEntityId()); + CreatePhysicsBody(sceneHandle, nodeConfig); + } + + RagdollNode::~RagdollNode() + { + DestroyPhysicsBody(); } void RagdollNode::SetJoint(const AZStd::shared_ptr& joint) @@ -124,4 +125,47 @@ namespace PhysX { return m_rigidBodyHandle; } + + void RagdollNode::CreatePhysicsBody(AzPhysics::SceneHandle sceneHandle, Physics::RagdollNodeConfiguration& nodeConfig) + { + if (auto* sceneInterface = AZ::Interface::Get()) + { + m_rigidBodyHandle = sceneInterface->AddSimulatedBody(sceneHandle, &nodeConfig); + if (m_rigidBodyHandle == AzPhysics::InvalidSimulatedBodyHandle) + { + AZ_Error("PhysX RagdollNode", false, "Failed to create rigid body for ragdoll node %s", nodeConfig.m_debugName.c_str()); + return; + } + m_rigidBody = azdynamic_cast(sceneInterface->GetSimulatedBodyFromHandle(sceneHandle, m_rigidBodyHandle)); + } + if (m_rigidBody == nullptr) + { + AZ_Error("PhysX RagdollNode", false, "Failed to create rigid body for ragdoll node %s", nodeConfig.m_debugName.c_str()); + return; + } + m_sceneOwner = sceneHandle; + + physx::PxRigidDynamic* pxRigidDynamic = static_cast(m_rigidBody->GetNativePointer()); + physx::PxTransform transform(PxMathConvert(nodeConfig.m_position), PxMathConvert(nodeConfig.m_orientation)); + pxRigidDynamic->setGlobalPose(transform); + + m_actorUserData = PhysX::ActorData(pxRigidDynamic); + m_actorUserData.SetRagdollNode(this); + m_actorUserData.SetEntityId(m_rigidBody->GetEntityId()); + } + + void RagdollNode::DestroyPhysicsBody() + { + if (m_rigidBody != nullptr) + { + if (auto* sceneInterface = AZ::Interface::Get()) + { + sceneInterface->RemoveSimulatedBody(m_sceneOwner, m_rigidBodyHandle); + } + m_rigidBody = nullptr; + m_rigidBodyHandle = AzPhysics::InvalidSimulatedBodyHandle; + m_sceneOwner = AzPhysics::InvalidSceneHandle; + } + } + } // namespace PhysX diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h index c23930e25e..0567723c01 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/API/RagdollNode.h @@ -29,8 +29,8 @@ namespace PhysX static void Reflect(AZ::ReflectContext* context); RagdollNode() = default; - explicit RagdollNode(AzPhysics::RigidBody* rigidBody, AzPhysics::SimulatedBodyHandle rigidBodyHandle); - ~RagdollNode() = default; + explicit RagdollNode(AzPhysics::SceneHandle sceneHandle, Physics::RagdollNodeConfiguration& nodeConfig); + ~RagdollNode(); void SetJoint(const AZStd::shared_ptr& joint); @@ -58,9 +58,13 @@ namespace PhysX AzPhysics::SimulatedBodyHandle GetRigidBodyHandle() const; private: + void CreatePhysicsBody(AzPhysics::SceneHandle sceneHandle, Physics::RagdollNodeConfiguration& nodeConfig); + void DestroyPhysicsBody(); + AZStd::shared_ptr m_joint; AzPhysics::RigidBody* m_rigidBody; AzPhysics::SimulatedBodyHandle m_rigidBodyHandle = AzPhysics::InvalidSimulatedBodyHandle; + AzPhysics::SceneHandle m_sceneOwner = AzPhysics::InvalidSceneHandle; PhysX::ActorData m_actorUserData; }; } // namespace PhysX diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp index 26ef5f0032..ca02554036 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/CharacterControllerComponent.cpp @@ -412,7 +412,6 @@ namespace PhysX AZ::TransformBus::EventResult(entityTranslation, GetEntityId(), &AZ::TransformBus::Events::GetWorldTranslation); m_characterConfig->m_position = entityTranslation; - AZ_Assert(m_controller == nullptr, "Calling create CharacterControllerComponent::CreateController() with an already created controller."); if (auto* sceneInterface = AZ::Interface::Get()) { AzPhysics::SimulatedBodyHandle bodyHandle = sceneInterface->AddSimulatedBody(defaultSceneHandle, m_characterConfig.get()); @@ -451,8 +450,8 @@ namespace PhysX if (auto* sceneInterface = AZ::Interface::Get()) { sceneInterface->RemoveSimulatedBody(m_controller->m_sceneOwner, m_controller->m_bodyHandle); - m_controller = nullptr; } + m_controller = nullptr; m_preSimulateHandler.Disconnect(); diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp index 56627ff7b9..d120e3d6b0 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.cpp @@ -55,6 +55,16 @@ namespace PhysX } } + if (classElement.GetVersion() < 3) + { + int ragdollElementIndex = classElement.FindElement(AZ_CRC_CE("PhysXRagdoll")); + + if (ragdollElementIndex >= 0) + { + classElement.RemoveElement(ragdollElementIndex); + } + } + return true; } @@ -66,8 +76,7 @@ namespace PhysX if (serializeContext) { serializeContext->Class() - ->Version(2, &VersionConverter) - ->Field("PhysXRagdoll", &RagdollComponent::m_ragdoll) + ->Version(3, &VersionConverter) ->Field("PositionIterations", &RagdollComponent::m_positionIterations) ->Field("VelocityIterations", &RagdollComponent::m_velocityIterations) ->Field("EnableJointProjection", &RagdollComponent::m_enableJointProjection) @@ -187,7 +196,7 @@ namespace PhysX Physics::Ragdoll* RagdollComponent::GetRagdoll() { - return m_ragdoll.get(); + return m_ragdoll; } void RagdollComponent::GetState(Physics::RagdollState& ragdollState) const @@ -250,7 +259,7 @@ namespace PhysX AzPhysics::SimulatedBody* RagdollComponent::GetWorldBody() { - return m_ragdoll.get(); + return GetRagdoll(); } AzPhysics::SceneQueryHit RagdollComponent::RayCast(const AzPhysics::RayCastRequest& request) @@ -283,8 +292,8 @@ namespace PhysX return; } - ParentIndices parentIndices; - parentIndices.resize(numNodes); + + ragdollConfiguration.m_parentIndices.resize(numNodes); for (size_t nodeIndex = 0; nodeIndex < numNodes; nodeIndex++) { AZStd::string parentName; @@ -292,7 +301,7 @@ namespace PhysX AzFramework::CharacterPhysicsDataRequestBus::EventResult(parentName, GetEntityId(), &AzFramework::CharacterPhysicsDataRequests::GetParentNodeName, nodeName); AZ::Outcome parentIndex = Utils::Characters::GetNodeIndex(ragdollConfiguration, parentName); - parentIndices[nodeIndex] = parentIndex ? parentIndex.GetValue() : SIZE_MAX; + ragdollConfiguration.m_parentIndices[nodeIndex] = parentIndex ? parentIndex.GetValue() : SIZE_MAX; ragdollConfiguration.m_nodes[nodeIndex].m_entityId = GetEntityId(); } @@ -303,12 +312,17 @@ namespace PhysX AZ::Transform entityTransform = AZ::Transform::CreateIdentity(); AZ::TransformBus::EventResult(entityTransform, GetEntityId(), &AZ::TransformBus::Events::GetWorldTM); - Physics::RagdollState bindPoseWorld = GetBindPoseWorld(bindPose, entityTransform); + ragdollConfiguration.m_initialState = GetBindPoseWorld(bindPose, entityTransform); AzPhysics::SceneHandle defaultSceneHandle = AzPhysics::InvalidSceneHandle; Physics::DefaultWorldBus::BroadcastResult(defaultSceneHandle, &Physics::DefaultWorldRequests::GetDefaultSceneHandle); - m_ragdoll = Utils::Characters::CreateRagdoll(ragdollConfiguration, bindPoseWorld, parentIndices, defaultSceneHandle); - if (!m_ragdoll) + + if (auto* sceneInterface = AZ::Interface::Get()) + { + AzPhysics::SimulatedBodyHandle bodyHandle = sceneInterface->AddSimulatedBody(defaultSceneHandle, &ragdollConfiguration); + m_ragdoll = azdynamic_cast(sceneInterface->GetSimulatedBodyFromHandle(defaultSceneHandle, bodyHandle)); + } + if (m_ragdoll == nullptr) { AZ_Error("PhysX Ragdoll Component", false, "Failed to create ragdoll."); return; @@ -358,7 +372,11 @@ namespace PhysX AzFramework::RagdollPhysicsNotificationBus::Event(GetEntityId(), &AzFramework::RagdollPhysicsNotifications::OnRagdollDeactivated); - m_ragdoll.reset(); + if (auto* sceneInterface = AZ::Interface::Get()) + { + sceneInterface->RemoveSimulatedBody(m_ragdoll->m_sceneOwner, m_ragdoll->m_bodyHandle); + } + m_ragdoll = nullptr; } } diff --git a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h index 77a4c992a3..1b616dda79 100644 --- a/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h +++ b/Gems/PhysX/Code/Source/PhysXCharacters/Components/RagdollComponent.h @@ -32,7 +32,7 @@ namespace PhysX , public AzFramework::CharacterPhysicsDataNotificationBus::Handler { public: - AZ_COMPONENT(RagdollComponent, "{B89498F8-4718-42FE-A457-A377DD0D61A0}"); + AZ_COMPONENT(PhysX::RagdollComponent, "{B89498F8-4718-42FE-A457-A377DD0D61A0}"); static void Reflect(AZ::ReflectContext* context); @@ -105,7 +105,7 @@ namespace PhysX bool IsJointProjectionVisible(); - AZStd::unique_ptr m_ragdoll; + Ragdoll* m_ragdoll; /// Minimum number of position iterations to perform in the PhysX solver. /// Lower iteration counts are less expensive but may behave less realistically. AZ::u32 m_positionIterations = 16; diff --git a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp index 1e6eee774e..03bbac9fd4 100644 --- a/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp +++ b/Gems/PhysX/Code/Source/Scene/PhysXScene.cpp @@ -209,6 +209,13 @@ namespace PhysX return controller; } + AzPhysics::SimulatedBody* CreateRagdollBody(PhysXScene* scene, + const Physics::RagdollConfiguration* ragdollConfig) + { + return Utils::Characters::CreateRagdoll(const_cast(*ragdollConfig), + scene->GetSceneHandle()); + } + //helper to perform a ray cast AzPhysics::SceneQueryHits RayCast(const AzPhysics::RayCastRequest* raycastRequest, AZStd::vector& raycastBuffer, @@ -622,6 +629,15 @@ namespace PhysX { newBody = Internal::CreateCharacterBody(this, azdynamic_cast(simulatedBodyConfig)); } + else if (azrtti_istypeof(simulatedBodyConfig)) + { + newBody = Internal::CreateRagdollBody(this, azdynamic_cast(simulatedBodyConfig)); + } + else + { + AZ_Warning("PhysXScene", false, "Unknown SimulatedBodyConfiguration."); + return AzPhysics::InvalidSimulatedBodyHandle; + } if (newBody != nullptr) { @@ -648,8 +664,11 @@ namespace PhysX newBody->m_bodyHandle = newBodyHandle; m_simulatedBodyAddedEvent.Signal(m_sceneHandle, newBodyHandle); - // Enable simulation by default (not signaling OnSimulationBodySimulationEnabled event) - EnableSimulationOfBodyInternal(*newBody); + // Enable simulation by default (not signaling OnSimulationBodySimulationEnabled event) + if (simulatedBodyConfig->m_startSimulationEnabled) + { + EnableSimulationOfBodyInternal(*newBody); + } return newBodyHandle; } @@ -878,7 +897,8 @@ namespace PhysX void PhysXScene::EnableSimulationOfBodyInternal(AzPhysics::SimulatedBody& body) { //character controller is a special actor and only needs the m_simulating flag set, - if (!azrtti_istypeof(body)) + if (!azrtti_istypeof(body) && + !azrtti_istypeof(body)) { auto pxActor = static_cast(body.GetNativePointer()); AZ_Assert(pxActor, "Simulated Body doesn't have a valid physx actor"); @@ -904,7 +924,8 @@ namespace PhysX void PhysXScene::DisableSimulationOfBodyInternal(AzPhysics::SimulatedBody& body) { //character controller is a special actor and only needs the m_simulating flag set, - if (!azrtti_istypeof(body)) + if (!azrtti_istypeof(body) && + !azrtti_istypeof(body)) { auto pxActor = static_cast(body.GetNativePointer()); AZ_Assert(pxActor, "Simulated Body doesn't have a valid physx actor"); @@ -948,11 +969,14 @@ namespace PhysX void PhysXScene::ClearDeferedDeletions() { - for (auto& simulatedBody : m_deferredDeletions) + // swap the deletions in case the simulated body + // manages more bodies and removes them on destruction (ie. Ragdoll). + AZStd::vector deletions; + deletions.swap(m_deferredDeletions); + for (auto* simulatedBody : deletions) { delete simulatedBody; } - m_deferredDeletions.clear(); } void PhysXScene::ProcessTriggerEvents() diff --git a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp index 149dfac30b..4f905342be 100644 --- a/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp +++ b/Gems/PhysX/Code/Tests/Benchmarks/PhysXCharactersRagdollBenchmarks.cpp @@ -125,19 +125,24 @@ namespace PhysX::Benchmarks return GetTPose(AZ::Vector3::CreateZero(), simulationType); } - AZStd::unique_ptr CreateRagdoll(AzPhysics::SceneHandle sceneHandle) + PhysX::Ragdoll* CreateRagdoll(AzPhysics::SceneHandle sceneHandle) { Physics::RagdollConfiguration* configuration = AZ::Utils::LoadObjectFromFile(AZ::Test::GetEngineRootPath() + "/Gems/PhysX/Code/Tests/RagdollConfiguration.xml"); - Physics::RagdollState initialState = GetTPose(); - PhysX::ParentIndices parentIndices; + configuration->m_initialState = GetTPose(); + configuration->m_parentIndices.reserve(configuration->m_nodes.size()); for (int i = 0; i < configuration->m_nodes.size(); i++) { - parentIndices.push_back(RagdollTestData::ParentIndices[i]); + configuration->m_parentIndices.push_back(RagdollTestData::ParentIndices[i]); } - return PhysX::Utils::Characters::CreateRagdoll(*configuration, initialState, parentIndices, sceneHandle); + if (auto* sceneInterface = AZ::Interface::Get()) + { + AzPhysics::SimulatedBodyHandle bodyHandle = sceneInterface->AddSimulatedBody(sceneHandle, configuration); + return azdynamic_cast(sceneInterface->GetSimulatedBodyFromHandle(sceneHandle, bodyHandle)); + } + return nullptr; } //! BM_Ragdoll_AtRest - This test just spawns the requested number of ragdolls and places them near the terrain @@ -148,7 +153,7 @@ namespace PhysX::Benchmarks const int numRagdolls = static_cast(state.range(0)); //create ragdolls - AZStd::vector> ragdolls; + AZStd::vector ragdolls; ragdolls.reserve(numRagdolls); for (int i = 0; i < numRagdolls; i++) { @@ -218,7 +223,7 @@ namespace PhysX::Benchmarks washingMachineCentre, RagdollConstants::WashingMachine::BladeRPM); //create ragdolls - AZStd::vector> ragdolls; + AZStd::vector ragdolls; ragdolls.reserve(numRagdolls); for (int i = 0; i < numRagdolls; i++) { diff --git a/Gems/PhysX/Code/Tests/RagdollTests.cpp b/Gems/PhysX/Code/Tests/RagdollTests.cpp index 8e3bdc69c3..ec803c1707 100644 --- a/Gems/PhysX/Code/Tests/RagdollTests.cpp +++ b/Gems/PhysX/Code/Tests/RagdollTests.cpp @@ -37,7 +37,7 @@ namespace PhysX - + )DELIMITER"; @@ -63,19 +63,24 @@ namespace PhysX return ragdollState; } - AZStd::unique_ptr CreateRagdoll(AzPhysics::SceneHandle sceneHandle) + Ragdoll* CreateRagdoll(AzPhysics::SceneHandle sceneHandle) { Physics::RagdollConfiguration* configuration = AZ::Utils::LoadObjectFromFile(AZ::Test::GetCurrentExecutablePath() + "/Test.Assets/Gems/PhysX/Code/Tests/RagdollConfiguration.xml"); - Physics::RagdollState initialState = GetTPose(); - ParentIndices parentIndices; + configuration->m_initialState = GetTPose(); + configuration->m_parentIndices.reserve(configuration->m_nodes.size()); for (int i = 0; i < configuration->m_nodes.size(); i++) { - parentIndices.push_back(RagdollTestData::ParentIndices[i]); + configuration->m_parentIndices.push_back(RagdollTestData::ParentIndices[i]); } - return Utils::Characters::CreateRagdoll(*configuration, initialState, parentIndices, sceneHandle); + if (auto* sceneInterface = AZ::Interface::Get()) + { + AzPhysics::SimulatedBodyHandle bodyHandle = sceneInterface->AddSimulatedBody(sceneHandle, configuration); + return azdynamic_cast(sceneInterface->GetSimulatedBodyFromHandle(sceneHandle, bodyHandle)); + } + return nullptr; } #if AZ_TRAIT_DISABLE_FAILED_PHYSICS_TESTS diff --git a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp index 0d26d1cbc0..77b0959008 100644 --- a/Gems/PhysXDebug/Code/Source/SystemComponent.cpp +++ b/Gems/PhysXDebug/Code/Source/SystemComponent.cpp @@ -511,13 +511,13 @@ namespace PhysXDebug void SystemComponent::RenderBuffers() { - if (gEnv && !m_linePoints.empty()) + if (gEnv && gEnv->pRenderer && !m_linePoints.empty()) { AZ_Assert(m_linePoints.size() == m_lineColors.size(), "Lines: Expected an equal number of points to colors."); gEnv->pRenderer->GetIRenderAuxGeom()->DrawLines(m_linePoints.begin(), m_linePoints.size(), m_lineColors.begin(), 1.0f); } - if (gEnv && !m_trianglePoints.empty()) + if (gEnv && gEnv->pRenderer && !m_trianglePoints.empty()) { AZ_Assert(m_trianglePoints.size() == m_triangleColors.size(), "Triangles: Expected an equal number of points to colors."); gEnv->pRenderer->GetIRenderAuxGeom()->DrawTriangles(m_trianglePoints.begin(), m_trianglePoints.size(), m_triangleColors.begin()); @@ -829,7 +829,7 @@ namespace PhysXDebug { AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Physics); - if (m_settings.m_visualizationEnabled && m_culling.m_boxWireframe) + if (gEnv && gEnv->pRenderer && m_settings.m_visualizationEnabled && m_culling.m_boxWireframe) { ColorB wireframeColor = MapOriginalPhysXColorToUserDefinedValues(1); AABB lyAABB(AZAabbToLyAABB(cullingBoxAabb)); diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Cowboy_01.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Cowboy_01.fbx.assetinfo index 963975f48e..2db91380e3 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Cowboy_01.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Actor/Cowboy_01.fbx.assetinfo @@ -1,937 +1,442 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "ActorGroup", + "name": "cowboy_01", + "id": "{0020C9AF-AA5D-50CB-8FE0-4250396B3F9D}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "metaData": "AdjustActor -actorID $(ACTORID) -name \"cowboy_01\"\r\nActorSetCollisionMeshes -actorID $(ACTORID) -lod 0 -nodeList \"\"\r\nAdjustActor -actorID $(ACTORID) -nodesExcludedFromBounds \"\" -nodeAction \"select\"\r\nAdjustActor -actorID $(ACTORID) -nodeAction \"replace\" -attachmentNodes \"\"\r\nAdjustActor -actorID $(ACTORID) -motionExtractionNodeName \"Reference\"\r\nAdjustActor -actorID $(ACTORID) -mirrorSetup \"LeftUpLeg,RightUpLeg;RightUpLeg,LeftUpLeg;LeftShoulder,RightShoulder;RightShoulder,LeftShoulder;LeftLegHelper4,RightLegHelper4;LeftLeg,RightLeg;RightLegHelper4,LeftLegHelper4;RightLeg,LeftLeg;LeftArm,RightArm;RightArm,LeftArm;LeftLegHelper5,RightLegHelper5;LeftLegHelper8,RightLegHelper8;LeftLegHelper7,RightLegHelper7;LeftLegHelper6,RightLegHelper6;LeftFoot,RightFoot;RightLegHelper5,LeftLegHelper5;RightLegHelper8,LeftLegHelper8;RightLegHelper7,LeftLegHelper7;RightLegHelper6,LeftLegHelper6;RightFoot,LeftFoot;LeftArmHelper4,RightArmHelper4;LeftArmHelper1,RightArmHelper1;LeftArmHelper2,RightArmHelper2;LeftArmHelper3,RightArmHelper3;LeftForeArm,RightForeArm;RightArmHelper4,LeftArmHelper4;RightArmHelper3,LeftArmHelper3;RightArmHelper2,LeftArmHelper2;RightArmHelper1,LeftArmHelper1;RightForeArm,LeftForeArm;LeftLegHelper9,RightLegHelper9;LeftToeBase,RightToeBase;RightLegHelper9,LeftLegHelper9;RightToeBase,LeftToeBase;LeftArmHelper5,RightArmHelper5;LeftArmHelper8,RightArmHelper8;LeftArmHelper6,RightArmHelper6;LeftArmHelper7,RightArmHelper7;LeftHand,RightHand;RightArmHelper5,LeftArmHelper5;RightArmHelper8,LeftArmHelper8;RightArmHelper7,LeftArmHelper7;RightArmHelper6,LeftArmHelper6;RightHand,LeftHand;LeftArmHelper9,RightArmHelper9;LeftInHandPinky,RightInHandPinky;LeftInHandRing,RightInHandRing;LeftInHandIndex,RightInHandIndex;LeftHandThumb1,RightHandThumb1;RightArmHelper9,LeftArmHelper9;RightInHandPinky,LeftInHandPinky;RightInHandRing,LeftInHandRing;RightInHandIndex,LeftInHandIndex;RightHandThumb1,LeftHandThumb1;LeftHandPinky1,RightHandPinky1;LeftHandRing1,RightHandRing1;LeftHandMiddle1,RightHandMiddle1;LeftHandIndex1,RightHandIndex1;LeftHandThumb2,RightHandThumb2;RightHandPinky1,LeftHandPinky1;RightHandRing1,LeftHandRing1;RightHandMiddle1,LeftHandMiddle1;RightHandIndex1,LeftHandIndex1;RightHandThumb2,LeftHandThumb2;LeftHandPinky2,RightHandPinky2;LeftHandRing2,RightHandRing2;LeftHandMiddle2,RightHandMiddle2;LeftHandIndex2,RightHandIndex2;LeftHandThumb3,RightHandThumb3;RightHandPinky2,LeftHandPinky2;RightHandRing2,LeftHandRing2;RightHandMiddle2,LeftHandMiddle2;RightHandIndex2,LeftHandIndex2;RightHandThumb3,LeftHandThumb3;LeftHandPinky3,RightHandPinky3;LeftHandRing3,RightHandRing3;LeftHandMiddle3,RightHandMiddle3;LeftHandIndex3,RightHandIndex3;RightHandPinky3,LeftHandPinky3;RightHandRing3,LeftHandRing3;RightHandMiddle3,LeftHandMiddle3;RightHandIndex3,LeftHandIndex3;\"\r\n" + } + ] + } + }, + { + "$type": "{07B356B7-3635-40B5-878A-FAC4EFD5AD86} MeshGroup", + "name": "Cowboy_01", + "nodeSelectionList": { + "selectedNodes": [ + "RootNode", + "RootNode.Reference", + "RootNode.cowboy_01", + "RootNode.Reference.transform", + "RootNode.Reference.Hips", + "RootNode.cowboy_01.SkinWeight_0", + "RootNode.cowboy_01.transform", + "RootNode.cowboy_01.map1", + "RootNode.cowboy_01.mat_cowboy_01", + "RootNode.Reference.Hips.transform", + "RootNode.Reference.Hips.Spine", + "RootNode.Reference.Hips.Pelvis", + "RootNode.Reference.Hips.Spine.transform", + "RootNode.Reference.Hips.Spine.Spine1", + "RootNode.Reference.Hips.Pelvis.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg", + "RootNode.Reference.Hips.Pelvis.RightUpLeg", + "RootNode.Reference.Hips.Pelvis.Holster1", + "RootNode.Reference.Hips.Pelvis.Belt1", + "RootNode.Reference.Hips.Spine.Spine1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder", + "RootNode.Reference.Hips.Spine.Spine1.Neck", + "RootNode.Reference.Hips.Spine.Spine1.aimstart", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLegHelper4", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLegHelper4", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.HolsterPin1", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg", + "RootNode.Reference.Hips.Pelvis.Holster1.transform", + "RootNode.Reference.Hips.Pelvis.Holster1.Holster2", + "RootNode.Reference.Hips.Pelvis.Belt1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm", + "RootNode.Reference.Hips.Spine.Spine1.Neck.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.transform", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.aimend", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.propmatch", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLegHelper4.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLegHelper4.LeftLegHelper5", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper8", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper7", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper6", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftFoot", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLegHelper4.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLegHelper4.RightLegHelper5", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.HolsterPin1.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper8", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper7", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper6", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightFoot", + "RootNode.Reference.Hips.Pelvis.Holster1.Holster2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper4", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper1", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper2", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper3", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper4", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmPV", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.aimend.transform", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.propmatch.transform", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.propmatch.aimwristmatch", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLegHelper4.LeftLegHelper5.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper8.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper8.LeftLegHelper9", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper7.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper6.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftFoot.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftFoot.LeftToeBase", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLegHelper4.RightLegHelper5.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper8.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper8.RightLegHelper9", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper7.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper6.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightFoot.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightFoot.RightToeBase", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper4.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper4.LeftArmHelper5", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper3.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper8", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper6", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper7", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper4.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper4.RightArmHelper5", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper8", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper7", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper6", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmPV.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_eye_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_eye_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.aimstart.propmatch.aimwristmatch.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftLegHelper8.LeftLegHelper9.transform", + "RootNode.Reference.Hips.Pelvis.LeftUpLeg.LeftLeg.LeftFoot.LeftToeBase.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightLegHelper8.RightLegHelper9.transform", + "RootNode.Reference.Hips.Pelvis.RightUpLeg.RightLeg.RightFoot.RightToeBase.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftArmHelper4.LeftArmHelper5.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper8.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper8.LeftArmHelper9", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper6.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper7.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightArmHelper4.RightArmHelper5.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper8.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper8.RightArmHelper9", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper7.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper6.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.prop", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_eye_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_eye_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT.Rt_Hair0_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT.Rt_Hair1_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botTeeth_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT.Lf_Hair0_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT.Lf_Hair1_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browExt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browCen_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browInt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_brow_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browInt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browCen_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browExt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseOut_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseCen_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseInt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseInt_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseCen_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseOut_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topTeeth_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Lf_cheek_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Rt_cheek_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftArmHelper8.LeftArmHelper9.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1.LeftHandThumb2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightArmHelper8.RightArmHelper9.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1.RightHandThumb2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.prop.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT.Rt_Hair0_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT.Rt_Hair0_PUPPET_1_JNT.Rt_Hair0_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT.Rt_Hair1_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT.Rt_Hair1_PUPPET_1_JNT.Rt_Hair1_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT.Ct_BackHair_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botTeeth_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_cornerLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Ct_botLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_cornerLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT.Lf_Hair0_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT.Lf_Hair0_PUPPET_1_JNT.Lf_Hair0_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT.Lf_Hair1_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT.Lf_Hair1_PUPPET_1_JNT.Lf_Hair1_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browExt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browCen_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_browInt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_brow_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browInt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browCen_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_browExt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_lidCorner_in_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_lidCorner_out_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_lidCorner_in_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_lidCorner_out_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseOut_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseCen_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_cheekRaiseInt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseInt_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseCen_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_cheekRaiseOut_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT.Lf_nostril_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT.Rt_nostril_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Ct_topLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topTeeth_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Lf_cheek_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Rt_cheek_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1.LeftHandPinky2", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1.LeftHandRing2", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1.LeftHandMiddle2", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1.LeftHandIndex2", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1.LeftHandThumb2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1.LeftHandThumb2.LeftHandThumb3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1.RightHandPinky2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1.RightHandRing2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1.RightHandMiddle2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1.RightHandIndex2", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1.RightHandThumb2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1.RightHandThumb2.RightHandThumb3", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair0_PUPPET_0_JNT.Rt_Hair0_PUPPET_1_JNT.Rt_Hair0_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Rt_Hair1_PUPPET_0_JNT.Rt_Hair1_PUPPET_1_JNT.Rt_Hair1_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT.Ct_BackHair_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT.Ct_BackHair_PUPPET_2_JNT.Ct_BackHair_PUPPET_3_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT.Ct_tongue_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_cornerLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Rt_botLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Ct_botLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_botLip_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_botMuzzle_0_JNT.Lf_cornerLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair0_PUPPET_0_JNT.Lf_Hair0_PUPPET_1_JNT.Lf_Hair0_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Lf_Hair1_PUPPET_0_JNT.Lf_Hair1_PUPPET_1_JNT.Lf_Hair1_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_lidCorner_in_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_lidCorner_out_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_lidCorner_in_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_lidCorner_out_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT.Lf_nostril_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_nose_0_JNT.Rt_nostril_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Rt_topLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Ct_topLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headBot_0_JNT.Ct_topMuzzle_0_JNT.Lf_topLip_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1.LeftHandPinky2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1.LeftHandPinky2.LeftHandPinky3", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1.LeftHandRing2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1.LeftHandRing2.LeftHandRing3", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1.LeftHandMiddle2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1.LeftHandMiddle2.LeftHandMiddle3", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1.LeftHandIndex2.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1.LeftHandIndex2.LeftHandIndex3", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftHandThumb1.LeftHandThumb2.LeftHandThumb3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1.RightHandPinky2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1.RightHandPinky2.RightHandPinky3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1.RightHandRing2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1.RightHandRing2.RightHandRing3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1.RightHandMiddle2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1.RightHandMiddle2.RightHandMiddle3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1.RightHandIndex2.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1.RightHandIndex2.RightHandIndex3", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightHandThumb1.RightHandThumb2.RightHandThumb3.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_BackHair_PUPPET_0_JNT.Ct_BackHair_PUPPET_1_JNT.Ct_BackHair_PUPPET_2_JNT.Ct_BackHair_PUPPET_3_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT.Ct_tongue_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT.Ct_tongue_2_JNT.Ct_tongue_3_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT.Lf_Hat_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT.Rt_Hat_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT.Ct_FrontHair_PUPPET_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT.Rt_botLid_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT.Rt_botLid_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT.Rt_topLid_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT.Rt_topLid_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT.Lf_botLid_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT.Lf_botLid_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT.Lf_topLid_1_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT.Lf_topLid_2_JNT", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandPinky.LeftHandPinky1.LeftHandPinky2.LeftHandPinky3.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandRing.LeftHandRing1.LeftHandRing2.LeftHandRing3.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandMIddle.LeftHandMiddle1.LeftHandMiddle2.LeftHandMiddle3.transform", + "RootNode.Reference.Hips.Spine.Spine1.LeftShoulder.LeftArm.LeftForeArm.LeftHand.LeftInHandIndex.LeftHandIndex1.LeftHandIndex2.LeftHandIndex3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandPinky.RightHandPinky1.RightHandPinky2.RightHandPinky3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandRing.RightHandRing1.RightHandRing2.RightHandRing3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandMiddle.RightHandMiddle1.RightHandMiddle2.RightHandMiddle3.transform", + "RootNode.Reference.Hips.Spine.Spine1.RightShoulder.RightArm.RightForeArm.RightHand.RightInHandIndex.RightHandIndex1.RightHandIndex2.RightHandIndex3.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_jaw_0_JNT.Ct_tongue_0_JNT.Ct_tongue_1_JNT.Ct_tongue_2_JNT.Ct_tongue_3_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT.Lf_Hat_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT.Lf_Hat_PUPPET_2_JNT.Lf_Hat_PUPPET_3_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT.Rt_Hat_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT.Rt_Hat_PUPPET_2_JNT.Rt_Hat_PUPPET_3_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT.Ct_FrontHair_PUPPET_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT.Ct_FrontHair_PUPPET_2_JNT.Ct_FrontHair_PUPPET_3_JNT", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT.Rt_botLid_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_botLidMain_0_JNT.Rt_botLid_0_JNT.Rt_botLid_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT.Rt_topLid_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Rt_eyeSocket_0_JNT.Rt_topLidMain_0_JNT.Rt_topLid_0_JNT.Rt_topLid_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT.Lf_botLid_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_botLidMain_0_JNT.Lf_botLid_0_JNT.Lf_botLid_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT.Lf_topLid_1_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Lf_eyeSocket_0_JNT.Lf_topLidMain_0_JNT.Lf_topLid_0_JNT.Lf_topLid_2_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_0_JNT.Lf_Hat_PUPPET_1_JNT.Lf_Hat_PUPPET_2_JNT.Lf_Hat_PUPPET_3_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_0_JNT.Rt_Hat_PUPPET_1_JNT.Rt_Hat_PUPPET_2_JNT.Rt_Hat_PUPPET_3_JNT.transform", + "RootNode.Reference.Hips.Spine.Spine1.Neck.Neck1.Head.Ct_headTop_0_JNT.Ct_Hat_PUPPET_0_JNT.Ct_FrontHair_PUPPET_0_JNT.Ct_FrontHair_PUPPET_1_JNT.Ct_FrontHair_PUPPET_2_JNT.Ct_FrontHair_PUPPET_3_JNT.transform" + ] + }, + "rules": { + "rules": [ + { + "$type": "SkinRule" + }, + { + "$type": "MaterialRule" + } + ] + }, + "id": "{6247689D-B117-4653-A672-12198E7EDD69}" + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/aimposes01.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/aimposes01.fbx.assetinfo index 74e470b719..60a381de2c 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/aimposes01.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/aimposes01.fbx.assetinfo @@ -1,109 +1,56 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "aimposes01", + "selectedRootBone": "RootNode.Reference", + "id": "{394BA97A-7EF3-56B3-ADE2-D9D734AA5B6B}", + "rules": { + "rules": [ + { + "$type": "MotionRangeRule" + }, + { + "$type": "MotionSamplingRule" + } + ] + } + }, + { + "$type": "MotionGroup", + "name": "aimposes01-1", + "selectedRootBone": "RootNode.Reference", + "id": "{991539D2-8F87-40EF-9664-7994FFEA6B34}", + "rules": { + "rules": [ + { + "$type": "MotionRangeRule", + "startFrame": 1, + "endFrame": 1 + }, + { + "$type": "MotionSamplingRule" + } + ] + } + }, + { + "$type": "MotionGroup", + "name": "aimposes01-2", + "selectedRootBone": "RootNode.Reference", + "id": "{DBCED014-4E7E-4865-9F94-F84B85F6B007}", + "rules": { + "rules": [ + { + "$type": "MotionRangeRule", + "startFrame": 2, + "endFrame": 2 + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/idle_cwby_01.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/idle_cwby_01.fbx.assetinfo index 2e4a8f55d7..2ca1f67d65 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/idle_cwby_01.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/idle_cwby_01.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "idle_cwby_01", + "selectedRootBone": "RootNode.Reference", + "id": "{492E8A35-2647-581F-A701-F1D2A9FBB979}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/reload.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/reload.fbx.assetinfo index 4cd5a8194a..3d935c330e 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/reload.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/reload.fbx.assetinfo @@ -1,137 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "reload", + "selectedRootBone": "RootNode.Reference", + "id": "{28092685-3550-5583-A666-CD60018AB2E9}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "ReloadEvent", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "ReloadEvent", + "startTime": 0.509211003780365, + "endTime": 0.509211003780365, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "ReloadEvent", + "startTime": 1.2446810007095338, + "endTime": 1.2446810007095338, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "ReloadEvent", + "startTime": 1.4295190572738648, + "endTime": 1.4295190572738648, + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/run.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/run.fbx.assetinfo index b93139dc83..c32d66694b 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/run.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/run.fbx.assetinfo @@ -1,137 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "run", + "selectedRootBone": "RootNode.Reference", + "id": "{7D6889F1-6536-57B6-8B02-93C815D1ADA9}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "Sync", + "startTime": 0.3396751880645752, + "endTime": 0.3396751880645752, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "Sync", + "startTime": 0.6319156885147095, + "endTime": 0.6319156885147095, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/shootrecoil.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/shootrecoil.fbx.assetinfo index 89f051b5eb..9536e6597d 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/shootrecoil.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/shootrecoil.fbx.assetinfo @@ -1,91 +1,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "shootrecoil", + "selectedRootBone": "RootNode.Reference", + "id": "{A1DC3BB2-3324-50F3-8C4B-BBFB61623129}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "RecoilEvent", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "RecoilEvent", + "startTime": 0.23250000178813935, + "endTime": 0.23250000178813935, + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeback.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeback.fbx.assetinfo index 91b795d9af..9d7c7e299c 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeback.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeback.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeback", + "selectedRootBone": "RootNode.Reference", + "id": "{CA0EF712-DA36-5DA8-B474-207BD250CF2F}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameEvents", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameEvents", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackl.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackl.fbx.assetinfo index 00ba9b3830..b22d00d3fe 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackl.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackl.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafebackl", + "selectedRootBone": "RootNode.Reference", + "id": "{9433F0E6-EA1A-5473-AA21-EE4DC45387C1}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackr.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackr.fbx.assetinfo index 7f15392868..6b7dd5c4aa 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackr.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafebackr.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafebackr", + "selectedRootBone": "RootNode.Reference", + "id": "{5392AC3D-FF18-51F5-984E-248CAAF09F2E}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforward.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforward.fbx.assetinfo index 5003f620ca..a0dd296fa9 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforward.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforward.fbx.assetinfo @@ -1,137 +1,59 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeforward", + "selectedRootBone": "RootNode.Reference", + "id": "{2FB879C6-B3FB-5BD8-B52B-1012000351C2}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "Sync", + "startTime": 0.2708907127380371, + "endTime": 0.2708907127380371, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "Sync", + "startTime": 0.9699265956878662, + "endTime": 0.9699265956878662, + "eventDatas": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardl.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardl.fbx.assetinfo index bd6a91a56c..233d7d248e 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardl.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardl.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeforwardl", + "selectedRootBone": "RootNode.Reference", + "id": "{2D945D52-C313-57A3-B722-C6402ACC3506}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardr.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardr.fbx.assetinfo index 7014e29bcf..5332ba04bd 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardr.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeforwardr.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeforwardr", + "selectedRootBone": "RootNode.Reference", + "id": "{3E691B9F-C0D7-5BFD-BBBC-50BAE737886E}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeinplace.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeinplace.fbx.assetinfo index 6ad0025f61..4d7e41b48a 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeinplace.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeinplace.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeinplace", + "selectedRootBone": "RootNode.Reference", + "id": "{A2686CFC-D49B-5468-AE9F-E3F84FA75C6D}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeleft.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeleft.fbx.assetinfo index a257eba8e0..02114bd336 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeleft.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/strafeleft.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "strafeleft", + "selectedRootBone": "RootNode.Reference", + "id": "{2093C7DF-0C51-5C2B-B763-4DC1CC81D10E}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/straferight.fbx.assetinfo b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/straferight.fbx.assetinfo index c4308f71e2..28ac40918d 100644 --- a/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/straferight.fbx.assetinfo +++ b/Gems/PhysXSamples/Assets/Characters/Cowboy/Animations/straferight.fbx.assetinfo @@ -1,91 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{ + "values": [ + { + "$type": "MotionGroup", + "name": "straferight", + "selectedRootBone": "RootNode.Reference", + "id": "{CE0E45E9-4B8C-5340-9521-B6290BAB24FC}", + "rules": { + "rules": [ + { + "$type": "MetaDataRule", + "commands": [ + { + "$type": "CommandSystem::CommandAdjustMotion", + "dirtyFlag": {}, + "motionExtractionFlags": {}, + "name": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "Sync", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEventTrack", + "eventTrackName": "GameState", + "eventTrackIndex": {}, + "isEnabled": {} + }, + { + "$type": "CommandSystem::CommandCreateMotionEvent", + "eventTrackName": "GameState", + "eventDatas": {} + } + ] + }, + { + "$type": "MotionSamplingRule" + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp index f49ace2e58..ba82f58889 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp @@ -528,8 +528,10 @@ namespace ScriptCanvasEditor { const auto& variableId = varConfig.m_graphVariable.GetVariableId(); + // We only add component sourced graph properties to the script canvas component, so if this variable was switched to a graph-only property remove it. + // Also be sure to remove this variable if it's been deleted entirely. auto graphVariable = graphVarData.FindVariable(variableId); - if (!graphVariable->IsComponentProperty()) + if (!graphVariable || !graphVariable->IsComponentProperty()) { oldVariableIds.push_back(variableId); } diff --git a/Tools/Crashpad/LICENSE b/Tools/Crashpad/LICENSE deleted file mode 100644 index d645695673..0000000000 --- a/Tools/Crashpad/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libbase.a b/Tools/Crashpad/bin/mac/Debug_x64/libbase.a deleted file mode 100644 index 0701c2a9ec..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libbase.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb76d30a6782e42737778d75d67192eff8770745a327c7f0bcb172478bbee693 -size 3334464 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a deleted file mode 100644 index a392638ff7..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_client.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60ae111931f84ebfd0fb477f894c16193f2b661448610ef28dadb6e25669f6b6 -size 2307704 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a deleted file mode 100644 index 3918508de5..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_handler_lib.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b77a7b85064278b9550fb4926ede40486401023fa0aa3791e26c5b54c89ed065 -size 3076056 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a deleted file mode 100644 index b0e539f27c..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_minidump.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d84217997c2c29c46e2df33883a9e869ba3a65f22dd014b858dee25cc75f199 -size 11129296 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a deleted file mode 100644 index 71345a07be..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_snapshot.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b43625a00c5e82b21ffbd3f76b15a02b556497a11dea64a70bae065dc6db383a -size 9991040 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a deleted file mode 100644 index df88fd5acd..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_tool_support.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36d6797b5180e458a04f39ebc7ccc4e9a077f94161aa6a1aa500a6dd2532f677 -size 76256 diff --git a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a b/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a deleted file mode 100644 index 473b5db188..0000000000 --- a/Tools/Crashpad/bin/mac/Debug_x64/libcrashpad_util.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a976d5ae4e58c41b1203c37c0538ce9b690bfd2c7bd41602c29bb628a4bed12 -size 10371432 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libbase.a b/Tools/Crashpad/bin/mac/Release_x64/libbase.a deleted file mode 100644 index 20c4c11d77..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libbase.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d7a99dd8cf3b1cadb7e638ede71bf143e787189352800cebe18b6148748497d -size 2312800 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a deleted file mode 100644 index 4c94113647..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_client.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7721d60e9c15dc07c63b0c457047f359dcd21de08ca1a1c858cb20799be83d6d -size 1802480 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a deleted file mode 100644 index 7e74206a91..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_handler_lib.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:307a8ac4a2bfc08ff98e10063b503ce7f7dbc8c45bfa3eeb1459f28fced0a69a -size 2532480 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a deleted file mode 100644 index 0bbd3bf9a6..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_minidump.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f8e32c3fabea8c59f5afc7df2643ad70539aa3db10c2dae97cf3e9281507bf8 -size 8205936 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a deleted file mode 100644 index b5c5430938..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_snapshot.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36ed8253faf1600d136923bf86ef52a812490e43c9caadee61ae28f2ecf1995b -size 7803856 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a deleted file mode 100644 index beb086069a..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_tool_support.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3123a5553a578b8494cc9453ab039a3198cfa564f3b8b9ccef4a8a593caffa1c -size 77256 diff --git a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a b/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a deleted file mode 100644 index 67aa51650b..0000000000 --- a/Tools/Crashpad/bin/mac/Release_x64/libcrashpad_util.a +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7fd642b088929e74140930107ce9a4f06099eaa8e78dc9c024b98db3201f9fe -size 7588096 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb deleted file mode 100644 index 5ab13ea0e2..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6507de8507e07f3a3a3c216392951dd04cb8303d3c851cee3b6f8ef2615ccbb0 -size 536576 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib deleted file mode 100644 index e64fd3652b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:faf9b73e55eb744a6a672444affcf29338552623bd24400fb858b17242b3ab90 -size 2987702 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb deleted file mode 100644 index b87712773f..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0877dd0586810f9f376a712ad9240ee73a35358fa32c7eb74e16f020772f9b51 -size 790528 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib deleted file mode 100644 index 56fe8cbfe6..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad8c021cd42687428b312cac1ad233f6101708e49437ef817959c303f5e69f37 -size 3481946 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb deleted file mode 100644 index e4fba84562..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:631d2c813cd5f3b258555013db4dc90d57a692df60d3dad5398fce14fd2e69a7 -size 1265664 diff --git a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib deleted file mode 100644 index f10144feb1..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Debug_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b1e018c8571ab9e1b06c9e3a5750038a9589c2442563678815ae37a47512c80 -size 10799690 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb deleted file mode 100644 index 0ef01d8df6..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49e77aeba8ff229ed1df999af9ef55fd3beaffe57b3f498036be4445809f5c6f -size 512000 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib deleted file mode 100644 index e4b8713573..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d58e0c4a46398a0feaf922c2325b57650f7b80947075ed024f5317c0101e0ebf -size 2604980 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb deleted file mode 100644 index 63ff75fff6..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb5c38028547b3834b92fcd5f5381b893bd9e5e9f7b3946ae3616f8d5209fbbd -size 733184 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib deleted file mode 100644 index a81d7ee8a2..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2157bd0d5f2408074879ba68027bf78ad4585b97eac469281a8c2159f10c0fa -size 3024914 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb deleted file mode 100644 index 2cbb95208b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e477cfcc3433eb2311e4b4349ad9690f61a658298d0a82acb68f53bec086b56c -size 1191936 diff --git a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib deleted file mode 100644 index 0b1cbcd4b0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2013/Release_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7e7f0c899275be00dc64474d0880f9bbd67989f2df9cd69bd1fc6b6ef36f194b -size 9327612 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb deleted file mode 100644 index 01af8cfd30..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5eeba748c1c424bf1d354a51b1e804aa37874bb6113a28a80138e1a88df9eef -size 610304 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib deleted file mode 100644 index 14460afd47..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c5a31ccb663c6becbcc2d479a659f51891465c8664a5d70cf6ebf9a881eaabb0 -size 2279968 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb deleted file mode 100644 index b641cd41b1..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76458fdb9688fd8ec6d01cd127e480c0807a599df4442d83e3d0d5700203b169 -size 995328 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib deleted file mode 100644 index 7115fc716c..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e5b56aa6a11ecb0f0bf20ed52600c2783bb51192609e058942f6ecddb6f29a7 -size 3872018 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb deleted file mode 100644 index d3f8dd301a..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:158bec9dec5eb5b9e0bda8a3c6eb20413726ec5e2c32254acc1b7e5d63e884fb -size 77824 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib deleted file mode 100644 index db959bc6b0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_compat.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f749466487567392cb530d5b6adf104f607f3c665781fe5d28ad402366da453 -size 10570 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb deleted file mode 100644 index 241f04444d..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:811d32c5432a78abe224ebbfa8f05c3cd970264147fde83d31af286bc0bd7ad1 -size 1478656 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib deleted file mode 100644 index c8573fa0e7..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_handler_lib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:997162e154b9cb76cbad70f8e6ce40060309ba6b481d146405fd41bc4ef433a2 -size 3713948 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb deleted file mode 100644 index 4f463b3ca9..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f8e52266f2bf35d924559f5b84cbef8f5418ea393edd4a538b3c515c2f5b5f0 -size 2068480 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib deleted file mode 100644 index bf6e3be321..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_minidump.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d998572e0831aba01ab666f2db70ad728f6fc3ee681ccb5b843d4b5d5c42b46 -size 17842252 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb deleted file mode 100644 index ac2289b38f..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6ffe73a6ab9b9255588c674715d20aabdf0e8af1e6cc27fb0308aed059eea4d -size 1961984 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib deleted file mode 100644 index af8fd630a8..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_snapshot.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fb734f4bc60eaa336af62ab42567fec79dbb0223ed96af6dec6ea3cc3226ea6 -size 15449366 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb deleted file mode 100644 index f05e897ed8..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5baba8a9eb72453324f8175ab5f2dd25ee981a6177b66982b010a55af87263ef -size 446464 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib deleted file mode 100644 index e40a81202a..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_tool_support.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8f330beadc180fe3f29061d743e0025c3725bf5051adcca55f199cdffbaa1f8 -size 330198 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb deleted file mode 100644 index 0675bb8c21..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97c7247ce76fabf3857e9a8dcc2d913d8dbc67bd5df8e3578050d447837f571f -size 1601536 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib deleted file mode 100644 index fb6afc5fdb..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bafac5994b2d7a5ecd062cc64f28c09be45a0cd805bcd3c4c4204d278d61bca -size 11807818 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb deleted file mode 100644 index 5ef03ecd9b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5af26522ab427c4ec2ea9dbe0c41eca46bb31475b8b87ab47c513e56839ba763 -size 86016 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib deleted file mode 100644 index 2c42ac90b0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/getopt.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd974c961c1a1443414bc21cfa10440ed1367c7cfa15fd9608ca431631917a65 -size 22644 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb deleted file mode 100644 index 58c4ab5305..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.c.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76c990a27c549c0428095bdbe97060a40d33c3a897587ddd06e2ee8db15d4770 -size 102400 diff --git a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib deleted file mode 100644 index 0b3dab07d7..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Debug_x64/third_party/zlib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78cbbb2b947e55fb13b3f97366d759d22e828ccf2588f2a412b924fcbd2524d8 -size 350630 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb deleted file mode 100644 index 897a49ed6a..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:146c69b75db404f36b7d980559d3c055cd87349d7ec7505c6813b85dd139f93d -size 577536 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib deleted file mode 100644 index 425894ece4..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3771477293933cf29951aa4a6de64018e051a9edfde878a7cc00af0531ecf0f9 -size 1733068 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb deleted file mode 100644 index b78b277aaf..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ba035d4d229d0ec21aa1aa3ce56771e0b190437ea6e4cf3e5f5670cc5eadb06 -size 946176 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib deleted file mode 100644 index bb9a8a29f2..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83ad7341f5e86ce67bdc317f9c5e317bb86167cfef95edd1f2ff334df0c9dec2 -size 3152942 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb deleted file mode 100644 index e78ef129f5..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf7040092ebad18ba2460b4688fe44420d78c7c22dccb6fc929ec90f07d7fc77 -size 77824 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib deleted file mode 100644 index 8b156f977e..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_compat.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd56d961d1bc5674e98a3bd17ecca53f96bfd2d9f65c3f37c580fbe9e49ee3fb -size 9974 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb deleted file mode 100644 index 38425e2b20..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a63732692819a559de517c7b7c8fcf974a3120055f2fd14b0a1429a543ff6b3b -size 1413120 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib deleted file mode 100644 index 664dfbec5b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_handler_lib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e76377c0ee89df91327dcc7f62813cb4391d9856fdb2583962b0e18e3cc348c -size 2894530 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb deleted file mode 100644 index 309cdfd390..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db9d3ade234934995bea6e0f9ca047e0356593cffa0c7a044829452c955c71fa -size 1904640 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib deleted file mode 100644 index 89770393fe..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_minidump.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43a46db4050f95aa4f18587115573bee354241950a91349327ac183ebdca6e99 -size 13470898 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb deleted file mode 100644 index 5617dec7c2..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b34cc8a085cce244ebd8eec546b6fe8c65d8b7f60f4d329588d403aa17411d7f -size 1789952 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib deleted file mode 100644 index d32ffb8486..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_snapshot.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1c4293d8e391406f2eb7c35d54e39ae1aaf10c96e17739741c2eb554c5ef9de -size 11151442 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb deleted file mode 100644 index 4bd52125c0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3acf84a1adf173c3dac27ba68265b5e264d81733063c062a95661bdf75b890b -size 421888 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib deleted file mode 100644 index a670e739f4..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_tool_support.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:700e7c1ec69bcbb12109e689d46dabb9c83ff6f311be54142eb143dd4ffe1b0a -size 246684 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb deleted file mode 100644 index f4a24c9ab9..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:887b5d2083179234e07ad7478a0f0533134ab929aaad204a54a3dc4ce27d153f -size 1511424 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib deleted file mode 100644 index d3f1017c19..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d342aa57bea9070e5ca768418f8b3fd0a36f735c8c5160a636ad4912a64505c0 -size 9416408 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb deleted file mode 100644 index 5976aa378d..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d154da0553fd94ec3e5059503a41db03f1d68fffed12fc76ab4902ec75f6298e -size 86016 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib deleted file mode 100644 index cf8a5cb625..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/getopt.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f8b36cf3305d9d10e97ebac28d53cf3f6c8cf117d8fc8bac3312c65c8e48d77 -size 29408 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb deleted file mode 100644 index 9d6836d135..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.c.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97f469e3a535f77fc242040bb80d36f8883182868bb070c33fec041722605259 -size 102400 diff --git a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib deleted file mode 100644 index b755b2ce8c..0000000000 --- a/Tools/Crashpad/bin/windows/vs2015/Release_x64/third_party/zlib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5f1d98d742d61d430c0bbc73eeb4ab9dc7afb6adaa8bdde7570fe28a3a4aac8 -size 388862 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib deleted file mode 100644 index 5f9059e1d7..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:626086670063e2d25c747e4532fba8b070122b63cfd119da97ff96b13a6c3d6e -size 2094438 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb deleted file mode 100644 index 88de799261..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/base_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:270034ee51a53ef434d0383765f951910319b7045867d10e66fb7bc5e5a8f380 -size 831488 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib deleted file mode 100644 index fe4eaddad1..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:302ef869aad53a2ea5681ee1c5a96e198e5d521165bd6a9027d09ffd7df38fa5 -size 3914060 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb deleted file mode 100644 index f93a003b98..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_client_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45020f9f0b490f1c001e6cc8bf1c45a29d678611c4655f85074fe23fa6c5ddd1 -size 1175552 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib deleted file mode 100644 index 3f4d33f8b9..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:004901f966fc28e9ae6aecc8086302592cb43208ec31a7c074f699533d84c2db -size 8978 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb deleted file mode 100644 index 03f989686b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_compat_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3aa1cba7cd1564df06777f4dcb4057f8bd2fcbc176ec8a494b17f7277e44a4d -size 77824 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib deleted file mode 100644 index 5652923545..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36acc956e8ecf13ed164d4c416bcc92f0f31db5f30f3d1e7beb33e398a41443b -size 63796 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb deleted file mode 100644 index 35c42abfea..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_context_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f97ecc158d23e273367171dc032ce3ed7feeec7b7221ccf10e36d304ee467b7e -size 454656 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib deleted file mode 100644 index c9f32e4272..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5ed7b8a7193e75ff9588e6c7d06e2a3c0afda514a620dd275c1338ba6acd161 -size 3054554 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb deleted file mode 100644 index 1328fd6d03..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_handler_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65903b1d9275b9268bdf7af1e4c2f2de46cd8dcc83eae4bfa64c2f5b38edbc57 -size 2887680 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib deleted file mode 100644 index 3796a0478e..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0e78280364d17a23a8feb819d71fb830f67ca40b7c932467263740cb2917ead -size 13044588 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb deleted file mode 100644 index 4c58046197..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_minidump_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5885d9f72f86181199e6b2f1e7fb96419982209fe7e2c8f7b06b7c77c332c836 -size 2289664 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib deleted file mode 100644 index f8b4588ed5..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fb181c40f80438d0b50f79b093a3503c853a43db8e92f7d5ddfd5bb13793b16 -size 12965800 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb deleted file mode 100644 index 992891a75f..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_snapshot_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27ab636cdc02fe86b73c40961c289d810f4f31be9c59c61e7c5300f0e9168fe9 -size 2355200 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib deleted file mode 100644 index 330ad9beee..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f00b8108a7849e92d4711a0106b94931eced1859fb0281a423ad5179cacdf399 -size 240574 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb deleted file mode 100644 index ff5ecf71a6..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_tool_support_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:026ca665e79cf98df13477abe84201dd1bdba7a0068b3b411b89eaf9cc8c1711 -size 446464 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib deleted file mode 100644 index 78b3281e6c..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3a6cd014d7a1096ab492ea62061c8eac341ffe97a856710b2dd65e183fe9248 -size 11636150 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb deleted file mode 100644 index 1f51fdbfd5..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/crashpad_util_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4c2b7e7ca514f1f5e768e4c7f5ec341f04b5f1e5fe82a8885476d1e1ed833f4 -size 2363392 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb deleted file mode 100644 index 5ef03ecd9b..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5af26522ab427c4ec2ea9dbe0c41eca46bb31475b8b87ab47c513e56839ba763 -size 86016 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib deleted file mode 100644 index 2c42ac90b0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/getopt.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd974c961c1a1443414bc21cfa10440ed1367c7cfa15fd9608ca431631917a65 -size 22644 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb deleted file mode 100644 index 58c4ab5305..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.c.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76c990a27c549c0428095bdbe97060a40d33c3a897587ddd06e2ee8db15d4770 -size 102400 diff --git a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib deleted file mode 100644 index 0b3dab07d7..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Debug_x64/third_party/zlib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78cbbb2b947e55fb13b3f97366d759d22e828ccf2588f2a412b924fcbd2524d8 -size 350630 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib deleted file mode 100644 index ab843e4478..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07139d47140d27876fff382036637bab1e22ae8c65b5ceaf37f92fcd347587a7 -size 1124438 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb deleted file mode 100644 index 366ca528e2..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/base_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b09045400a4ee55542916a915c111072a4f8b27be77378cb52f1597fd87d8150 -size 806912 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib deleted file mode 100644 index 027348705d..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4cbb4e87fe52a5b85739cb2cc562cc9da718b8a2d62df74428d40ccdf62cce2 -size 1696870 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb deleted file mode 100644 index 5a66efa3bf..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_client_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae28bf771c2788a34bf642ab95ba102e5d6c7b8e22b23742a93b8092b5c5e687 -size 1085440 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib deleted file mode 100644 index 7cf7f10d4c..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0803ce1fe7b23397997d6cc160803e44c7c172616223004ee5f17a5ae41d165 -size 8734 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb deleted file mode 100644 index bee40682a0..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_compat_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69f1497cdf145f98a04d05cc4bae8f7c60e98de3faafab46c9dacc95d4557fb5 -size 77824 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib deleted file mode 100644 index 8699928d13..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8a96c249ee9af8ddd9d9f66b93cd7ec5edb45dc5e0e012645917490a80897e3 -size 49100 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb deleted file mode 100644 index c92e68adbd..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_context_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8fd31008151c0e7cb2dc6f3547d391ba69aeb4741b8b5b5e76abd83b6415e100 -size 430080 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib deleted file mode 100644 index e2d8a48531..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c9099859046bf4dafcf6455c39accfefe5ca389d8bfdc86fe2209c5e4b8804f -size 1157858 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb deleted file mode 100644 index 49e5c1d8b1..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_handler_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca7cc3c846da2017736d813e56e32071d9e720319dc8fd636372923a3c25d223 -size 2527232 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib deleted file mode 100644 index 4ef4c8ae40..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3430726856c3b68f422614166ed64e7249b2246363c27fd2d63e63f668c2e47d -size 5155320 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb deleted file mode 100644 index 4a2457000f..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_minidump_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae7f896e3613565161bc41b90dc45aed9539c82261d9b5c2ed9c5a3a0b8f31b9 -size 2052096 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib deleted file mode 100644 index 698f891924..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c1ca49c6246323d9d4f854f4e8767735fdd51b0cc3faa7ce3d5a985e65db1a5 -size 4598666 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb deleted file mode 100644 index 01de39bbf7..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_snapshot_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9eac108b65d4b45ffc08d11f457274c25e9c7aba978b79cdcccd0894a07f679c -size 2134016 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib deleted file mode 100644 index 64786f1069..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:232322c240867a6a781784c754ac69a5e5452ff7bf6ac582ace35e9b1f68aada -size 95970 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb deleted file mode 100644 index ec48eeab69..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_tool_support_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a2b9b1d36c94c189d9c5ea821a2b819b01c4db449fa6b6a574e19efc2600978 -size 413696 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib deleted file mode 100644 index 4c346532a8..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6bf62815ecf6591fda46ba72b3636df660d5ceaa6571d55dec0f4b306d69cb1 -size 5704098 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb deleted file mode 100644 index bd5f778e18..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/crashpad_util_cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e30478f7aa319924d5b2578ec038cd58f93d9be726e918dc6693964b9550532 -size 2256896 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb deleted file mode 100644 index 5976aa378d..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.cc.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d154da0553fd94ec3e5059503a41db03f1d68fffed12fc76ab4902ec75f6298e -size 86016 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib deleted file mode 100644 index cf8a5cb625..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/getopt.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f8b36cf3305d9d10e97ebac28d53cf3f6c8cf117d8fc8bac3312c65c8e48d77 -size 29408 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb deleted file mode 100644 index 9d6836d135..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.c.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97f469e3a535f77fc242040bb80d36f8883182868bb070c33fec041722605259 -size 102400 diff --git a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib b/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib deleted file mode 100644 index b755b2ce8c..0000000000 --- a/Tools/Crashpad/bin/windows/vs2019/Release_x64/third_party/zlib.lib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5f1d98d742d61d430c0bbc73eeb4ab9dc7afb6adaa8bdde7570fe28a3a4aac8 -size 388862 diff --git a/Tools/Crashpad/building/README.txt b/Tools/Crashpad/building/README.txt deleted file mode 100644 index 05e6de2629..0000000000 --- a/Tools/Crashpad/building/README.txt +++ /dev/null @@ -1,110 +0,0 @@ -Base instructions for building crashpad live at https://chromium.googlesource.com/crashpad/crashpad/+/HEAD/doc/developing.md - -This document is intended to cover changes from the base instructions for building Lumberyard's crashpad libraries. - -depot_tools runs its own copy of the git client which is not granted a Cylance exclusion so you may run into issues and need to do manual git pulls (I did). - -Lumberyard currently builds a 2013 and 2015 version of Crashpad. Crashpad stopped supporting 2013 in December 2016 so it is necessary to checkout an earlier version for this build. To get the correct build: - -Crashpad clone - git fetch crashpad -Crashpad sync to "good" december version for 2013 - git checkout 556c4e - -Crashpad has its own set of 3rdParty libraries which are handled by depot_tools - in the case of mini_chromium it is necessary to sync to the same checkout as above when building for 2013. - -Clone mini_chromium to 2013 version: -delete third_party/mini_chromium/mini_chromium/build/common -git clone https://chromium.googlesource.com/chromium/mini_chromium -Sync to good (pre december) Cl - (from within mini_chromium dir) git checkout ca7f42a - -Make sure to copy over third_party/mini_chromium/mini_chromium.gyp -make .gypi changes from mini_chromium/mini_chromium/build and crashpad/build - -RuntimeLibraries and ITERATOR_DEBUG settings need to match with Lumberyard Settings: - -Added to build\crashpad.gypi - - 'configurations': { - 'Debug': { - 'msvs_settings': { - 'VCCLCompilerTool' : { - 'RuntimeLibrary': '3' /MDd - } - } - }, - 'Debug_x64': { - 'msvs_settings': { - 'VCCLCompilerTool' : { - 'RuntimeLibrary': '3' /MDd - } - } - }, - 'Release': { - 'msvs_settings': { - 'VCCLCompilerTool' : { - 'RuntimeLibrary': '2' /MD - } - }, - 'defines': [ - '_ITERATOR_DEBUG_LEVEL=0' - ] - }, - 'Release_x64': { - 'msvs_settings': { - 'VCCLCompilerTool' : { - 'RuntimeLibrary': '2' /MD - } - }, - 'defines': [ - '_ITERATOR_DEBUG_LEVEL=0' - - } - -mini_chromium base settings live in third_party/mini_chromium/mini_chromium/build/common.gypi - switch RuntimeLibrary in debug from 1 to 3 there - -The ninja build system doesn't seem to have a great way to force a full rebuild (Their stated goal is to build as little as possible as quickly as possible), so when from time to time you find you need to force a full rebuild: -Cleaning (from crashpad/crashpad): -del /s /q *.obj -del /s /q *.lib - -I made minor modifications to the crash report uploader so a confirmation dialog could be displayed to the user. The file is checked in perforce as dev/Tools/Crashpad/handler/src/crash_report_upload_thread.cc which should be copied over the existing copy from git which lives in crashpad\handler or the changes can be merged in if necessary. The new block is in ProcessPendingReport and currently looks like: - -// Amazon - Handle giving the user the option of whether or not to send the report. -#if defined(OS_WIN) - std::wstring sendDialogMessage{ L"Lumberyard has encountered a fatal error. We're sorry for the inconvenience.\n\nA Lumberyard Editor crash debugging file has been created at:\n" }; - sendDialogMessage += report.file_path.value(); - sendDialogMessage += L"\n\nIf you are willing to submit this file to Amazon it will help us improve the Lumberyard experience. We will treat this report as confidential.\n\nWould you like to send the error report?"; - - int msgboxID = MessageBox( - NULL, - sendDialogMessage.data(), - L"Send Error Report", - (MB_ICONEXCLAMATION | MB_YESNO | MB_SYSTEMMODAL) - ); - - if (msgboxID == IDNO) - { - database_->SkipReportUpload(report.uuid, - Metrics::CrashSkippedReason::kUploadsDisabled); - database_->DeleteReport(report.uuid); - return; - } -#endif - -Currently we build the Debug_x64 and Release_x64 variant for both 2015 and 2013. -Build output goes to out\\obj\ - -The libraries we use are: - -crashpad_client.lib from client (Also include crashpad_client.cc.pdb) -base.lib from third_party\mini_chromium\mini_chromium\base (and base.cc.pdb) -crashpad_util.lib from util (and crashpad_util.cc.pdb) - -All sit together in dev\Tools\Crashpad\bin\windows\vs2015\Debug_x64 (Or whichever is the corresponding compiler/build target you're making) - -Each have some include headers that need to go into dev\Tools\Crashpad\include - there are about 15 or so total and hopefully don't need changing from the time of this writing, but if you build with a newer version of Crashpad for 2015 than I did (which was around April 1 2017) you may need to make some updates. - -The 2013 headers have their own directory at Crashpad\include\vs2013. - -Then the handler exe is crashpad_handler.exe which goes in dev\tools\Crashpad\handler. We only need one of those, I used the Release_x64 variant for 2015. - -Use the python in (root)/dev/python to do building. \ No newline at end of file diff --git a/Tools/Crashpad/handler/crashpad_handler.exe b/Tools/Crashpad/handler/crashpad_handler.exe deleted file mode 100644 index 958cfa0bf7..0000000000 --- a/Tools/Crashpad/handler/crashpad_handler.exe +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b4e80690178401311f2bb1ba98da4ba668682a10561a3399f085557a18af79a -size 1029632 diff --git a/Tools/Crashpad/handler/src/crash_report_upload_thread.cc b/Tools/Crashpad/handler/src/crash_report_upload_thread.cc deleted file mode 100644 index ccb1512e24..0000000000 --- a/Tools/Crashpad/handler/src/crash_report_upload_thread.cc +++ /dev/null @@ -1,406 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "handler/crash_report_upload_thread.h" - -#include -#include - -#include -#include -#include -#include - -#include "base/logging.h" -#include "base/strings/stringprintf.h" -#include "base/strings/utf_string_conversions.h" -#include "build/build_config.h" -#include "client/settings.h" -#include "handler/minidump_to_upload_parameters.h" -#include "snapshot/minidump/process_snapshot_minidump.h" -#include "snapshot/module_snapshot.h" -#include "util/file/file_reader.h" -#include "util/misc/metrics.h" -#include "util/misc/uuid.h" -#include "util/net/http_body.h" -#include "util/net/http_multipart_builder.h" -#include "util/net/http_transport.h" -#include "util/net/url.h" -#include "util/stdlib/map_insert.h" - -#if defined(OS_MACOSX) -#include "handler/mac/file_limit_annotation.h" -#endif // OS_MACOSX - -// Amazon - Handle giving the user the option of whether or not to send the report. -namespace O3de -{ - bool CheckConfirmation(const crashpad::CrashReportDatabase::Report& report); - bool AddAttachments(crashpad::HTTPMultipartBuilder& multipartBuilder); - bool UpdateHttpTransport(std::unique_ptr& httpTransport, const std::string& baseURL); -} - -namespace crashpad { - -namespace { - -// Calls CrashReportDatabase::RecordUploadAttempt() with |successful| set to -// false upon destruction unless disarmed by calling Fire() or Disarm(). Fire() -// triggers an immediate call. Armed upon construction. -class CallRecordUploadAttempt { - public: - CallRecordUploadAttempt(CrashReportDatabase* database, - const CrashReportDatabase::Report* report) - : database_(database), - report_(report) { - } - - ~CallRecordUploadAttempt() { - Fire(); - } - - void Fire() { - if (report_) { - database_->RecordUploadAttempt(report_, false, std::string()); - } - - Disarm(); - } - - void Disarm() { - report_ = nullptr; - } - - private: - CrashReportDatabase* database_; // weak - const CrashReportDatabase::Report* report_; // weak - - DISALLOW_COPY_AND_ASSIGN(CallRecordUploadAttempt); -}; - -} // namespace - -CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database, - const std::string& url, - const Options& options) - : options_(options), - url_(url), - // When watching for pending reports, check every 15 minutes, even in the - // absence of a signal from the handler thread. This allows for failed - // uploads to be retried periodically, and for pending reports written by - // other processes to be recognized. - thread_(options.watch_pending_reports ? 15 * 60.0 - : WorkerThread::kIndefiniteWait, - this), - known_pending_report_uuids_(), - database_(database) {} - -CrashReportUploadThread::~CrashReportUploadThread() { -} - -void CrashReportUploadThread::Start() { - thread_.Start( - options_.watch_pending_reports ? 0.0 : WorkerThread::kIndefiniteWait); -} - -void CrashReportUploadThread::Stop() { - thread_.Stop(); -} - -void CrashReportUploadThread::ReportPending(const UUID& report_uuid) { - known_pending_report_uuids_.PushBack(report_uuid); - thread_.DoWorkNow(); -} - -void CrashReportUploadThread::ProcessPendingReports() { - std::vector known_report_uuids = known_pending_report_uuids_.Drain(); - for (const UUID& report_uuid : known_report_uuids) { - CrashReportDatabase::Report report; - if (database_->LookUpCrashReport(report_uuid, &report) != - CrashReportDatabase::kNoError) { - continue; - } - - ProcessPendingReport(report); - - // Respect Stop() being called after at least one attempt to process a - // report. - if (!thread_.is_running()) { - return; - } - } - - // Known pending reports are always processed (above). The rest of this - // function is concerned with scanning for pending reports not already known - // to this thread. - if (!options_.watch_pending_reports) { - return; - } - - std::vector reports; - if (database_->GetPendingReports(&reports) != CrashReportDatabase::kNoError) { - // The database is sick. It might be prudent to stop trying to poke it from - // this thread by abandoning the thread altogether. On the other hand, if - // the problem is transient, it might be possible to talk to it again on the - // next pass. For now, take the latter approach. - return; - } - - for (const CrashReportDatabase::Report& report : reports) { - if (std::find(known_report_uuids.begin(), - known_report_uuids.end(), - report.uuid) != known_report_uuids.end()) { - // An attempt to process the report already occurred above. The report is - // still pending, so upload must have failed. Don’t retry it immediately, - // it can wait until at least the next pass through this method. - continue; - } - - ProcessPendingReport(report); - - // Respect Stop() being called after at least one attempt to process a - // report. - if (!thread_.is_running()) { - return; - } - } -} - -void CrashReportUploadThread::ProcessPendingReport( - const CrashReportDatabase::Report& report) { -#if defined(OS_MACOSX) - RecordFileLimitAnnotation(); -#endif // OS_MACOSX - - Settings* const settings = database_->GetSettings(); - - bool uploads_enabled; - if (url_.empty() || - (!report.upload_explicitly_requested && - (!settings->GetUploadsEnabled(&uploads_enabled) || !uploads_enabled))) { - // Don’t attempt an upload if there’s no URL to upload to. Allow upload if - // it has been explicitly requested by the user, otherwise, respect the - // upload-enabled state stored in the database’s settings. - database_->SkipReportUpload(report.uuid, - Metrics::CrashSkippedReason::kUploadsDisabled); - return; - } - - // Amazon - Handle giving the user the option of whether or not to send the report. - if (!O3DE::CheckConfirmation(report)) - { - database_->SkipReportUpload(report.uuid, - Metrics::CrashSkippedReason::kUploadsDisabled); - database_->DeleteReport(report.uuid); - return; - } - - // This currently implements very simplistic rate-limiting, compatible with - // the Breakpad client, where the strategy is to permit one upload attempt per - // hour, and retire reports that would exceed this limit or for which the - // upload fails on the first attempt. - // - // If upload was requested explicitly (i.e. by user action), we do not - // throttle the upload. - // - // TODO(mark): Provide a proper rate-limiting strategy and allow for failed - // upload attempts to be retried. - if (!report.upload_explicitly_requested && options_.rate_limit) { - time_t last_upload_attempt_time; - if (settings->GetLastUploadAttemptTime(&last_upload_attempt_time)) { - time_t now = time(nullptr); - if (now >= last_upload_attempt_time) { - // If the most recent upload attempt occurred within the past hour, - // don’t attempt to upload the new report. If it happened longer ago, - // attempt to upload the report. - constexpr int kUploadAttemptIntervalSeconds = 60 * 60; // 1 hour - if (now - last_upload_attempt_time < kUploadAttemptIntervalSeconds) { - database_->SkipReportUpload( - report.uuid, Metrics::CrashSkippedReason::kUploadThrottled); - return; - } - } else { - // The most recent upload attempt purportedly occurred in the future. If - // it “happened” at least one day in the future, assume that the last - // upload attempt time is bogus, and attempt to upload the report. If - // the most recent upload time is in the future but within one day, - // accept it and don’t attempt to upload the report. - constexpr int kBackwardsClockTolerance = 60 * 60 * 24; // 1 day - if (last_upload_attempt_time - now < kBackwardsClockTolerance) { - database_->SkipReportUpload( - report.uuid, Metrics::CrashSkippedReason::kUnexpectedTime); - return; - } - } - } - } - - const CrashReportDatabase::Report* upload_report; - CrashReportDatabase::OperationStatus status = - database_->GetReportForUploading(report.uuid, &upload_report); - switch (status) { - case CrashReportDatabase::kNoError: - break; - - case CrashReportDatabase::kBusyError: - case CrashReportDatabase::kReportNotFound: - // Someone else may have gotten to it first. If they’re working on it now, - // this will be kBusyError. If they’ve already finished with it, it’ll be - // kReportNotFound. - return; - - case CrashReportDatabase::kFileSystemError: - case CrashReportDatabase::kDatabaseError: - // In these cases, SkipReportUpload() might not work either, but it’s best - // to at least try to get the report out of the way. - database_->SkipReportUpload(report.uuid, - Metrics::CrashSkippedReason::kDatabaseError); - return; - - case CrashReportDatabase::kCannotRequestUpload: - NOTREACHED(); - return; - } - - CallRecordUploadAttempt call_record_upload_attempt(database_, upload_report); - - std::string response_body; - UploadResult upload_result = UploadReport(upload_report, &response_body); - switch (upload_result) { - case UploadResult::kSuccess: - call_record_upload_attempt.Disarm(); - database_->RecordUploadAttempt(upload_report, true, response_body); - break; - case UploadResult::kPermanentFailure: - case UploadResult::kRetry: - call_record_upload_attempt.Fire(); - - // TODO(mark): Deal with retries properly: don’t call SkipReportUplaod() - // if the result was kRetry and the report hasn’t already been retried - // too many times. - database_->SkipReportUpload(report.uuid, - Metrics::CrashSkippedReason::kUploadFailed); - break; - } -} - -CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( - const CrashReportDatabase::Report* report, - std::string* response_body) { - std::map parameters; - - FileReader minidump_file_reader; - if (!minidump_file_reader.Open(report->file_path)) { - // If the minidump file can’t be opened, all hope is lost. - return UploadResult::kPermanentFailure; - } - - FileOffset start_offset = minidump_file_reader.SeekGet(); - if (start_offset < 0) { - return UploadResult::kPermanentFailure; - } - - // Ignore any errors that might occur when attempting to interpret the - // minidump file. This may result in its being uploaded with few or no - // parameters, but as long as there’s a dump file, the server can decide what - // to do with it. - ProcessSnapshotMinidump minidump_process_snapshot; - if (minidump_process_snapshot.Initialize(&minidump_file_reader)) { - parameters = - BreakpadHTTPFormParametersFromMinidump(&minidump_process_snapshot); - } - - if (!minidump_file_reader.SeekSet(start_offset)) { - return UploadResult::kPermanentFailure; - } - - HTTPMultipartBuilder http_multipart_builder; - http_multipart_builder.SetGzipEnabled(options_.upload_gzip); - - static constexpr char kMinidumpKey[] = "upload_file_minidump"; - - for (const auto& kv : parameters) { - if (kv.first == kMinidumpKey) { - LOG(WARNING) << "reserved key " << kv.first << ", discarding value " - << kv.second; - } else { - http_multipart_builder.SetFormData(kv.first, kv.second); - } - } - - http_multipart_builder.SetFileAttachment( - kMinidumpKey, -#if defined(OS_WIN) - base::UTF16ToUTF8(report->file_path.BaseName().value()), -#else - report->file_path.BaseName().value(), -#endif - &minidump_file_reader, - "application/octet-stream"); - - // Amazon - O3de::AddAttachments(http_multipart_builder); - - std::unique_ptr http_transport(HTTPTransport::Create()); - HTTPHeaders content_headers; - - http_multipart_builder.PopulateContentHeaders(&content_headers); - - for (const auto& content_header : content_headers) { - http_transport->SetHeader(content_header.first, content_header.second); - } - http_transport->SetBodyStream(http_multipart_builder.GetBodyStream()); - // TODO(mark): The timeout should be configurable by the client. - http_transport->SetTimeout(60.0); // 1 minute. - - std::string url = url_; - if (options_.identify_client_via_url) { - // Add parameters to the URL which identify the client to the server. - static constexpr struct { - const char* key; - const char* url_field_name; - } kURLParameterMappings[] = { - {"prod", "product"}, - {"ver", "version"}, - {"guid", "guid"}, - }; - - for (const auto& parameter_mapping : kURLParameterMappings) { - const auto it = parameters.find(parameter_mapping.key); - if (it != parameters.end()) { - url.append( - base::StringPrintf("%c%s=%s", - url.find('?') == std::string::npos ? '?' : '&', - parameter_mapping.url_field_name, - URLEncode(it->second).c_str())); - } - } - } - http_transport->SetURL(url); - - // Amazon - O3de::UpdateHttpTransport(http_transport, url); - - if (!http_transport->ExecuteSynchronously(response_body)) { - return UploadResult::kRetry; - } - - return UploadResult::kSuccess; -} - -void CrashReportUploadThread::DoWork(const WorkerThread* thread) { - ProcessPendingReports(); -} - -} // namespace crashpad diff --git a/Tools/Crashpad/include/client/annotation.h b/Tools/Crashpad/include/client/annotation.h deleted file mode 100644 index c7d92d80c5..0000000000 --- a/Tools/Crashpad/include/client/annotation.h +++ /dev/null @@ -1,264 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_ANNOTATION_H_ -#define CRASHPAD_CLIENT_ANNOTATION_H_ - -#include -#include - -#include -#include -#include - -#include "base/logging.h" -#include "base/macros.h" -#include "base/numerics/safe_conversions.h" -#include "base/strings/string_piece.h" -#include "build/build_config.h" - -namespace crashpad { - -class AnnotationList; - -//! \brief Base class for an annotation, which records a name-value pair of -//! arbitrary data when set. -//! -//! After an annotation is declared, its `value_ptr_` will not be captured in a -//! crash report until a call to \a SetSize() specifies how much data from the -//! value should be recorded. -//! -//! Annotations should be declared with static storage duration. -//! -//! An example declaration and usage: -//! -//! \code -//! // foo.cc: -//! -//! namespace { -//! char g_buffer[1024]; -//! crashpad::Annotation g_buffer_annotation( -//! crashpad::Annotation::Type::kString, "buffer_head", g_buffer); -//! } // namespace -//! -//! void OnBufferProduced(size_t n) { -//! // Capture the head of the buffer, in case we crash when parsing it. -//! g_buffer_annotation.SetSize(std::min(64, n)); -//! -//! // Start parsing the header. -//! Frobinate(g_buffer, n); -//! } -//! \endcode -//! -//! Annotation objects are not inherently thread-safe. To manipulate them -//! from multiple threads, external synchronization must be used. -//! -//! Annotation objects should never be destroyed. Once they are Set(), they -//! are permanently referenced by a global object. -class Annotation { - public: - //! \brief The maximum length of an annotation’s name, in bytes. - static constexpr size_t kNameMaxLength = 64; - - //! \brief The maximum size of an annotation’s value, in bytes. - static constexpr size_t kValueMaxSize = 2048; - - //! \brief The type used for \a SetSize(). - using ValueSizeType = uint32_t; - - //! \brief The type of data stored in the annotation. - enum class Type : uint16_t { - //! \brief An invalid annotation. Reserved for internal use. - kInvalid = 0, - - //! \brief A `NUL`-terminated C-string. - kString = 1, - - //! \brief Clients may declare their own custom types by using values - //! greater than this. - kUserDefinedStart = 0x8000, - }; - - //! \brief Creates a user-defined Annotation::Type. - //! - //! This exists to remove the casting overhead of `enum class`. - //! - //! \param[in] value A value used to create a user-defined type. - //! - //! \returns The value added to Type::kUserDefinedStart and casted. - constexpr static Type UserDefinedType(uint16_t value) { - using UnderlyingType = std::underlying_type::type; - // MSVS 2015 doesn't have full C++14 support and complains about local - // variables defined in a constexpr function, which is valid. Avoid them - // and the also-problematic DCHECK until all the infrastructure is updated: - // https://crbug.com/crashpad/201. -#if !defined(OS_WIN) || (defined(_MSC_VER) && _MSC_VER >= 1910) - const UnderlyingType start = - static_cast(Type::kUserDefinedStart); - const UnderlyingType user_type = start + value; - DCHECK(user_type > start) << "User-defined Type is 0 or overflows"; - return static_cast(user_type); -#else - return static_cast( - static_cast(Type::kUserDefinedStart) + value); -#endif - } - - //! \brief Constructs a new annotation. - //! - //! Upon construction, the annotation will not be included in any crash - //! reports until \sa SetSize() is called with a value greater than `0`. - //! - //! \param[in] type The data type of the value of the annotation. - //! \param[in] name A `NUL`-terminated C-string name for the annotation. Names - //! do not have to be unique, though not all crash processors may handle - //! Annotations with the same name. Names should be constexpr data with - //! static storage duration. - //! \param[in] value_ptr A pointer to the value for the annotation. The - //! pointer may not be changed once associated with an annotation, but - //! the data may be mutated. - constexpr Annotation(Type type, const char name[], void* const value_ptr) - : link_node_(nullptr), - name_(name), - value_ptr_(value_ptr), - size_(0), - type_(type) {} - - //! \brief Specifies the number of bytes in \a value_ptr_ to include when - //! generating a crash report. - //! - //! A size of `0` indicates that no value should be recorded and is the - //! equivalent of calling \sa Clear(). - //! - //! This method does not mutate the data referenced by the annotation, it - //! merely updates the annotation system's bookkeeping. - //! - //! Subclasses of this base class that provide additional Set methods to - //! mutate the value of the annotation must call always call this method. - //! - //! \param[in] size The number of bytes. - void SetSize(ValueSizeType size); - - //! \brief Marks the annotation as cleared, indicating the \a value_ptr_ - //! should not be included in a crash report. - //! - //! This method does not mutate the data referenced by the annotation, it - //! merely updates the annotation system's bookkeeping. - void Clear(); - - //! \brief Tests whether the annotation has been set. - bool is_set() const { return size_ > 0; } - - Type type() const { return type_; } - ValueSizeType size() const { return size_; } - const char* name() const { return name_; } - const void* value() const { return value_ptr_; } - - protected: - friend class AnnotationList; - - std::atomic& link_node() { return link_node_; } - - private: - //! \brief Linked list next-node pointer. Accessed only by \sa AnnotationList. - //! - //! This will be null until the first call to \sa SetSize(), after which the - //! presence of the pointer will prevent the node from being added to the - //! list again. - std::atomic link_node_; - - const char* const name_; - void* const value_ptr_; - ValueSizeType size_; - const Type type_; - - DISALLOW_COPY_AND_ASSIGN(Annotation); -}; - -//! \brief An \sa Annotation that stores a `NUL`-terminated C-string value. -//! -//! The storage for the value is allocated by the annotation and the template -//! parameter \a MaxSize controls the maxmium length for the value. -//! -//! It is expected that the string value be valid UTF-8, although this is not -//! validated. -template -class StringAnnotation : public Annotation { - public: - //! \brief A constructor tag that enables braced initialization in C arrays. - //! - //! \sa StringAnnotation() - enum class Tag { kArray }; - - //! \brief Constructs a new StringAnnotation with the given \a name. - //! - //! \param[in] name The Annotation name. - constexpr explicit StringAnnotation(const char name[]) - : Annotation(Type::kString, name, value_), value_() {} - - //! \brief Constructs a new StringAnnotation with the given \a name. - //! - //! This constructor takes the ArrayInitializerTag for use when - //! initializing a C array of annotations. The main constructor is - //! explicit and cannot be brace-initialized. As an example: - //! - //! \code - //! static crashpad::StringAnnotation<32> annotations[] = { - //! {"name-1", crashpad::StringAnnotation<32>::Tag::kArray}, - //! {"name-2", crashpad::StringAnnotation<32>::Tag::kArray}, - //! {"name-3", crashpad::StringAnnotation<32>::Tag::kArray}, - //! }; - //! \endcode - //! - //! \param[in] name The Annotation name. - //! \param[in] tag A constructor tag. - constexpr StringAnnotation(const char name[], Tag tag) - : StringAnnotation(name) {} - - //! \brief Sets the Annotation's string value. - //! - //! \param[in] value The `NUL`-terminated C-string value. - void Set(const char* value) { - strncpy(value_, value, MaxSize); - SetSize( - std::min(MaxSize, base::saturated_cast(strlen(value)))); - } - - //! \brief Sets the Annotation's string value. - //! - //! \param[in] string The string value. - void Set(base::StringPiece string) { - Annotation::ValueSizeType size = - std::min(MaxSize, base::saturated_cast(string.size())); - memcpy(value_, string.data(), size); - // Check for no embedded `NUL` characters. - DCHECK(!memchr(value_, '\0', size)) << "embedded NUL"; - SetSize(size); - } - - const base::StringPiece value() const { - return base::StringPiece(value_, size()); - } - - private: - // This value is not `NUL`-terminated, since the size is stored by the base - // annotation. - char value_[MaxSize]; - - DISALLOW_COPY_AND_ASSIGN(StringAnnotation); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_ANNOTATION_H_ diff --git a/Tools/Crashpad/include/client/annotation_list.h b/Tools/Crashpad/include/client/annotation_list.h deleted file mode 100644 index 9485c46c4a..0000000000 --- a/Tools/Crashpad/include/client/annotation_list.h +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_ANNOTATION_LIST_H_ -#define CRASHPAD_CLIENT_ANNOTATION_LIST_H_ - -#include "base/macros.h" -#include "client/annotation.h" - -namespace crashpad { - -//! \brief A list that contains all the currently set annotations. -//! -//! An instance of this class must be registered on the \a CrashpadInfo -//! structure in order to use the annotations system. Once a list object has -//! been registered on the CrashpadInfo, a different instance should not -//! be used instead. -class AnnotationList { - public: - AnnotationList(); - ~AnnotationList(); - - //! \brief Returns the instance of the list that has been registered on the - //! CrashapdInfo structure. - static AnnotationList* Get(); - - //! \brief Returns the instace of the list, creating and registering - //! it if one is not already set on the CrashapdInfo structure. - static AnnotationList* Register(); - - //! \brief Adds \a annotation to the global list. This method does not need - //! to be called by clients directly. The Annotation object will do so - //! automatically. - //! - //! Once an annotation is added to the list, it is not removed. This is - //! because the AnnotationList avoids the use of locks/mutexes, in case it is - //! being manipulated in a compromised context. Instead, an Annotation keeps - //! track of when it has been cleared, which excludes it from a crash report. - //! This design also avoids linear scans of the list when repeatedly setting - //! and/or clearing the value. - void Add(Annotation* annotation); - - //! \brief An InputIterator for the AnnotationList. - class Iterator { - public: - ~Iterator(); - - Annotation* operator*() const; - Iterator& operator++(); - bool operator==(const Iterator& other) const; - bool operator!=(const Iterator& other) const { return !(*this == other); } - - private: - friend class AnnotationList; - Iterator(Annotation* head, const Annotation* tail); - - Annotation* curr_; - const Annotation* const tail_; - - // Copy and assign are required. - }; - - //! \brief Returns an iterator to the first element of the annotation list. - Iterator begin(); - - //! \brief Returns an iterator past the last element of the annotation list. - Iterator end(); - - private: - // To make it easier for the handler to locate the dummy tail node, store the - // pointer. Placed first for packing. - const Annotation* const tail_pointer_; - - // Dummy linked-list head and tail elements of \a Annotation::Type::kInvalid. - Annotation head_; - Annotation tail_; - - DISALLOW_COPY_AND_ASSIGN(AnnotationList); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_ANNOTATION_LIST_H_ diff --git a/Tools/Crashpad/include/client/capture_context_mac.h b/Tools/Crashpad/include/client/capture_context_mac.h deleted file mode 100644 index 74e440edb1..0000000000 --- a/Tools/Crashpad/include/client/capture_context_mac.h +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_ -#define CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_ - -#include - -#include "build/build_config.h" - -namespace crashpad { - -#if defined(ARCH_CPU_X86_FAMILY) -using NativeCPUContext = x86_thread_state; -#endif - -//! \brief Saves the CPU context. -//! -//! The CPU context will be captured as accurately and completely as possible, -//! containing an atomic snapshot at the point of this function’s return. This -//! function does not modify any registers. -//! -//! \param[out] cpu_context The structure to store the context in. -//! -//! \note On x86_64, the value for `%%rdi` will be populated with the address of -//! this function’s argument, as mandated by the ABI. If the value of -//! `%%rdi` prior to calling this function is needed, it must be obtained -//! separately prior to calling this function. For example: -//! \code -//! uint64_t rdi; -//! asm("movq %%rdi, %0" : "=m"(rdi)); -//! \endcode -void CaptureContext(NativeCPUContext* cpu_context); - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_ diff --git a/Tools/Crashpad/include/client/crash_report_database.h b/Tools/Crashpad/include/client/crash_report_database.h deleted file mode 100644 index 6211789923..0000000000 --- a/Tools/Crashpad/include/client/crash_report_database.h +++ /dev/null @@ -1,367 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_ -#define CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_ - -#include - -#include -#include -#include - -#include "base/files/file_path.h" -#include "base/macros.h" -#include "util/file/file_io.h" -#include "util/misc/metrics.h" -#include "util/misc/uuid.h" - -namespace crashpad { - -class Settings; - -//! \brief An interface for managing a collection of crash report files and -//! metadata associated with the crash reports. -//! -//! All Report objects that are returned by this class are logically const. -//! They are snapshots of the database at the time the query was run, and the -//! data returned is liable to change after the query is executed. -//! -//! The lifecycle of a crash report has three stages: -//! -//! 1. New: A crash report is created with PrepareNewCrashReport(), the -//! the client then writes the report, and then calls -//! FinishedWritingCrashReport() to make the report Pending. -//! 2. Pending: The report has been written but has not been locally -//! processed, or it was has been brought back from 'Completed' state by -//! user request. -//! 3. Completed: The report has been locally processed, either by uploading -//! it to a collection server and calling RecordUploadAttempt(), or by -//! calling SkipReportUpload(). -class CrashReportDatabase { - public: - //! \brief A crash report record. - //! - //! This represents the metadata for a crash report, as well as the location - //! of the report itself. A CrashReportDatabase maintains at least this - //! information. - struct Report { - Report(); - - //! A unique identifier by which this report will always be known to the - //! database. - UUID uuid; - - //! The current location of the crash report on the client’s filesystem. - //! The location of a crash report may change over time, so the UUID should - //! be used as the canonical identifier. - base::FilePath file_path; - - //! An identifier issued to this crash report by a collection server. - std::string id; - - //! The time at which the report was generated. - time_t creation_time; - - //! Whether this crash report was successfully uploaded to a collection - //! server. - bool uploaded; - - //! The last timestamp at which an attempt was made to submit this crash - //! report to a collection server. If this is zero, then the report has - //! never been uploaded. If #uploaded is true, then this timestamp is the - //! time at which the report was uploaded, and no other attempts to upload - //! this report will be made. - time_t last_upload_attempt_time; - - //! The number of times an attempt was made to submit this report to - //! a collection server. If this is more than zero, then - //! #last_upload_attempt_time will be set to the timestamp of the most - //! recent attempt. - int upload_attempts; - - //! Whether this crash report was explicitly requested by user to be - //! uploaded. This can be true only if report is in the 'pending' state. - bool upload_explicitly_requested; - }; - - //! \brief A crash report that is in the process of being written. - //! - //! An instance of this struct should be created via PrepareNewCrashReport() - //! and destroyed with FinishedWritingCrashReport(). - struct NewReport { - //! The file handle to which the report should be written. - FileHandle handle; - - //! A unique identifier by which this report will always be known to the - //! database. - UUID uuid; - - //! The path to the crash report being written. - base::FilePath path; - }; - - //! \brief A scoper to cleanly handle the interface requirement imposed by - //! PrepareNewCrashReport(). - //! - //! Calls ErrorWritingCrashReport() upon destruction unless disarmed by - //! calling Disarm(). Armed upon construction. - class CallErrorWritingCrashReport { - public: - //! \brief Arms the object to call ErrorWritingCrashReport() on \a database - //! with an argument of \a new_report on destruction. - CallErrorWritingCrashReport(CrashReportDatabase* database, - NewReport* new_report); - - //! \brief Calls ErrorWritingCrashReport() if the object is armed. - ~CallErrorWritingCrashReport(); - - //! \brief Disarms the object so that CallErrorWritingCrashReport() will not - //! be called upon destruction. - void Disarm(); - - private: - CrashReportDatabase* database_; // weak - NewReport* new_report_; // weak - - DISALLOW_COPY_AND_ASSIGN(CallErrorWritingCrashReport); - }; - - //! \brief The result code for operations performed on a database. - enum OperationStatus { - //! \brief No error occurred. - kNoError = 0, - - //! \brief The report that was requested could not be located. - //! - //! This may occur when the report is present in the database but not in a - //! state appropriate for the requested operation, for example, if - //! GetReportForUploading() is called to obtain report that’s already in the - //! completed state. - kReportNotFound, - - //! \brief An error occured while performing a file operation on a crash - //! report. - //! - //! A database is responsible for managing both the metadata about a report - //! and the actual crash report itself. This error is returned when an - //! error occurred when managing the report file. Additional information - //! will be logged. - kFileSystemError, - - //! \brief An error occured while recording metadata for a crash report or - //! database-wide settings. - //! - //! A database is responsible for managing both the metadata about a report - //! and the actual crash report itself. This error is returned when an - //! error occurred when managing the metadata about a crash report or - //! database-wide settings. Additional information will be logged. - kDatabaseError, - - //! \brief The operation could not be completed because a concurrent - //! operation affecting the report is occurring. - kBusyError, - - //! \brief The report cannot be uploaded by user request as it has already - //! been uploaded. - kCannotRequestUpload, - }; - - virtual ~CrashReportDatabase() {} - - //! \brief Opens a database of crash reports, possibly creating it. - //! - //! \param[in] path A path to the database to be created or opened. If the - //! database does not yet exist, it will be created if possible. Note that - //! for databases implemented as directory structures, existence refers - //! solely to the outermost directory. - //! - //! \return A database object on success, `nullptr` on failure with an error - //! logged. - //! - //! \sa InitializeWithoutCreating - static std::unique_ptr Initialize( - const base::FilePath& path); - - //! \brief Opens an existing database of crash reports. - //! - //! \param[in] path A path to the database to be opened. If the database does - //! not yet exist, it will not be created. Note that for databases - //! implemented as directory structures, existence refers solely to the - //! outermost directory. On such databases, as long as the outermost - //! directory is present, this method will create the inner structure. - //! - //! \return A database object on success, `nullptr` on failure with an error - //! logged. - //! - //! \sa Initialize - static std::unique_ptr InitializeWithoutCreating( - const base::FilePath& path); - - //! \brief Returns the Settings object for this database. - //! - //! \return A weak pointer to the Settings object, which is owned by the - //! database. - virtual Settings* GetSettings() = 0; - - //! \brief Creates a record of a new crash report. - //! - //! Callers can then write the crash report using the file handle provided. - //! The caller does not own the new crash report record or its file handle, - //! both of which must be explicitly disposed of by calling - //! FinishedWritingCrashReport() or ErrorWritingCrashReport(). - //! - //! To arrange to call ErrorWritingCrashReport() during any early return, use - //! CallErrorWritingCrashReport. - //! - //! \param[out] report A NewReport object containing a file handle to which - //! the crash report data should be written. Only valid if this returns - //! #kNoError. The caller must not delete the NewReport object or close - //! the file handle within. - //! - //! \return The operation status code. - virtual OperationStatus PrepareNewCrashReport(NewReport** report) = 0; - - //! \brief Informs the database that a crash report has been written. - //! - //! After calling this method, the database is permitted to move and rename - //! the file at NewReport::path. - //! - //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The - //! NewReport object and file handle within will be invalidated as part of - //! this call. - //! \param[out] uuid The UUID of this crash report. - //! - //! \return The operation status code. - virtual OperationStatus FinishedWritingCrashReport(NewReport* report, - UUID* uuid) = 0; - - //! \brief Informs the database that an error occurred while attempting to - //! write a crash report, and that any resources associated with it should - //! be cleaned up. - //! - //! After calling this method, the database is permitted to remove the file at - //! NewReport::path. - //! - //! \param[in] report A NewReport obtained with PrepareNewCrashReport(). The - //! NewReport object and file handle within will be invalidated as part of - //! this call. - //! - //! \return The operation status code. - virtual OperationStatus ErrorWritingCrashReport(NewReport* report) = 0; - - //! \brief Returns the crash report record for the unique identifier. - //! - //! \param[in] uuid The crash report record unique identifier. - //! \param[out] report A crash report record. Only valid if this returns - //! #kNoError. - //! - //! \return The operation status code. - virtual OperationStatus LookUpCrashReport(const UUID& uuid, - Report* report) = 0; - - //! \brief Returns a list of crash report records that have not been uploaded. - //! - //! \param[out] reports A list of crash report record objects. This must be - //! empty on entry. Only valid if this returns #kNoError. - //! - //! \return The operation status code. - virtual OperationStatus GetPendingReports(std::vector* reports) = 0; - - //! \brief Returns a list of crash report records that have been completed, - //! either by being uploaded or by skipping upload. - //! - //! \param[out] reports A list of crash report record objects. This must be - //! empty on entry. Only valid if this returns #kNoError. - //! - //! \return The operation status code. - virtual OperationStatus GetCompletedReports(std::vector* reports) = 0; - - //! \brief Obtains a report object for uploading to a collection server. - //! - //! The file at Report::file_path should be uploaded by the caller, and then - //! the returned Report object must be disposed of via a call to - //! RecordUploadAttempt(). - //! - //! A subsequent call to this method with the same \a uuid is illegal until - //! RecordUploadAttempt() has been called. - //! - //! \param[in] uuid The unique identifier for the crash report record. - //! \param[out] report A crash report record for the report to be uploaded. - //! The caller does not own this object. Only valid if this returns - //! #kNoError. - //! - //! \return The operation status code. - virtual OperationStatus GetReportForUploading(const UUID& uuid, - const Report** report) = 0; - - //! \brief Adjusts a crash report record’s metadata to account for an upload - //! attempt, and updates the last upload attempt time as returned by - //! Settings::GetLastUploadAttemptTime(). - //! - //! After calling this method, the database is permitted to move and rename - //! the file at Report::file_path. - //! - //! \param[in] report The report object obtained from - //! GetReportForUploading(). This object is invalidated after this call. - //! \param[in] successful Whether the upload attempt was successful. - //! \param[in] id The identifier assigned to this crash report by the - //! collection server. Must be empty if \a successful is `false`; may be - //! empty if it is `true`. - //! - //! \return The operation status code. - virtual OperationStatus RecordUploadAttempt(const Report* report, - bool successful, - const std::string& id) = 0; - - //! \brief Moves a report from the pending state to the completed state, but - //! without the report being uploaded. - //! - //! This can be used if the user has disabled crash report collection, but - //! crash generation is still enabled in the product. - //! - //! \param[in] uuid The unique identifier for the crash report record. - //! \param[in] reason The reason the report upload is being skipped for - //! metrics tracking purposes. - //! - //! \return The operation status code. - virtual OperationStatus SkipReportUpload( - const UUID& uuid, - Metrics::CrashSkippedReason reason) = 0; - - //! \brief Deletes a crash report file and its associated metadata. - //! - //! \param[in] uuid The UUID of the report to delete. - //! - //! \return The operation status code. - virtual OperationStatus DeleteReport(const UUID& uuid) = 0; - - //! \brief Marks a crash report as explicitly requested to be uploaded by the - //! user and moves it to 'pending' state. - //! - //! \param[in] uuid The unique identifier for the crash report record. - //! - //! \return The operation status code. - virtual OperationStatus RequestUpload(const UUID& uuid) = 0; - - protected: - CrashReportDatabase() {} - - private: - DISALLOW_COPY_AND_ASSIGN(CrashReportDatabase); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_CRASH_REPORT_DATABASE_H_ diff --git a/Tools/Crashpad/include/client/crashpad_client.h b/Tools/Crashpad/include/client/crashpad_client.h deleted file mode 100644 index c452cdbb68..0000000000 --- a/Tools/Crashpad/include/client/crashpad_client.h +++ /dev/null @@ -1,297 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_ -#define CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_ - -#include -#include -#include - -#include - -#include "base/files/file_path.h" -#include "base/macros.h" -#include "build/build_config.h" - -#if defined(OS_MACOSX) -#include "base/mac/scoped_mach_port.h" -#elif defined(OS_WIN) -#include -#include "util/win/scoped_handle.h" -#endif - -namespace crashpad { - -//! \brief The primary interface for an application to have Crashpad monitor -//! it for crashes. -class CrashpadClient { - public: - CrashpadClient(); - ~CrashpadClient(); - - //! \brief Starts a Crashpad handler process, performing any necessary - //! handshake to configure it. - //! - //! This method directs crashes to the Crashpad handler. On macOS, this is - //! applicable to this process and all subsequent child processes. On Windows, - //! child processes must also register by using SetHandlerIPCPipe(). - //! - //! On macOS, this method starts a Crashpad handler and obtains a Mach send - //! right corresponding to a receive right held by the handler process. The - //! handler process runs an exception server on this port. This method sets - //! the task’s exception port for `EXC_CRASH`, `EXC_RESOURCE`, and `EXC_GUARD` - //! exceptions to the Mach send right obtained. The handler will be installed - //! with behavior `EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES` and thread - //! state flavor `MACHINE_THREAD_STATE`. Exception ports are inherited, so a - //! Crashpad handler started here will remain the handler for any child - //! processes created after StartHandler() is called. These child processes do - //! not need to call StartHandler() or be aware of Crashpad in any way. The - //! Crashpad handler will receive crashes from child processes that have - //! inherited it as their exception handler even after the process that called - //! StartHandler() exits. - //! - //! On Windows, if \a asynchronous_start is `true`, this function will not - //! directly call `CreateProcess()`, making it suitable for use in a - //! `DllMain()`. In that case, the handler is started from a background - //! thread, deferring the handler's startup. Nevertheless, regardless of the - //! value of \a asynchronous_start, after calling this method, the global - //! unhandled exception filter is set up, and all crashes will be handled by - //! Crashpad. Optionally, use WaitForHandlerStart() to join with the - //! background thread and retrieve the status of handler startup. - //! - //! \param[in] handler The path to a Crashpad handler executable. - //! \param[in] database The path to a Crashpad database. The handler will be - //! started with this path as its `--database` argument. - //! \param[in] metrics_dir The path to an already existing directory where - //! metrics files can be stored. The handler will be started with this - //! path as its `--metrics-dir` argument. - //! \param[in] url The URL of an upload server. The handler will be started - //! with this URL as its `--url` argument. - //! \param[in] annotations Process annotations to set in each crash report. - //! The handler will be started with an `--annotation` argument for each - //! element in this map. - //! \param[in] arguments Additional arguments to pass to the Crashpad handler. - //! Arguments passed in other parameters and arguments required to perform - //! the handshake are the responsibility of this method, and must not be - //! specified in this parameter. - //! \param[in] restartable If `true`, the handler will be restarted if it - //! dies, if this behavior is supported. This option is not available on - //! all platforms, and does not function on all OS versions. If it is - //! not supported, it will be ignored. - //! \param[out] asynchronous_start If `true`, the handler will be started from - //! a background thread. Optionally, WaitForHandlerStart() can be used at - //! a suitable time to retreive the result of background startup. This - //! option is only used on Windows. - //! \param[in] attachments Vector that stores file paths that should be - //! captured with each report at the time of the crash. - //! - //! \return `true` on success, `false` on failure with a message logged. - bool StartHandler(const base::FilePath& handler, - const base::FilePath& database, - const base::FilePath& metrics_dir, - const std::string& url, - const std::map& annotations, - const std::vector& arguments, - bool restartable, - bool asynchronous_start, - const std::vector& attachments = {}); - -#if defined(OS_MACOSX) || DOXYGEN - //! \brief Sets the process’ crash handler to a Mach service registered with - //! the bootstrap server. - //! - //! This method is only defined on macOS. - //! - //! See StartHandler() for more detail on how the port and handler are - //! configured. - //! - //! \param[in] service_name The service name of a Crashpad exception handler - //! service previously registered with the bootstrap server. - //! - //! \return `true` on success, `false` on failure with a message logged. - bool SetHandlerMachService(const std::string& service_name); - - //! \brief Sets the process’ crash handler to a Mach port. - //! - //! This method is only defined on macOS. - //! - //! See StartHandler() for more detail on how the port and handler are - //! configured. - //! - //! \param[in] exception_port An `exception_port_t` corresponding to a - //! Crashpad exception handler service. - //! - //! \return `true` on success, `false` on failure with a message logged. - bool SetHandlerMachPort(base::mac::ScopedMachSendRight exception_port); - - //! \brief Retrieves a send right to the process’ crash handler Mach port. - //! - //! This method is only defined on macOS. - //! - //! This method can be used to obtain the crash handler Mach port when a - //! Crashpad client process wishes to provide a send right to this port to - //! another process. The IPC mechanism used to convey the right is under the - //! application’s control. If the other process wishes to become a client of - //! the same crash handler, it can provide the transferred right to - //! SetHandlerMachPort(). - //! - //! See StartHandler() for more detail on how the port and handler are - //! configured. - //! - //! \return The Mach port set by SetHandlerMachPort(), possibly indirectly by - //! a call to another method such as StartHandler() or - //! SetHandlerMachService(). This method must only be called after a - //! successful call to one of those methods. `MACH_PORT_NULL` on failure - //! with a message logged. - base::mac::ScopedMachSendRight GetHandlerMachPort() const; -#endif - -#if defined(OS_WIN) || DOXYGEN - //! \brief Sets the IPC pipe of a presumably-running Crashpad handler process - //! which was started with StartHandler() or by other compatible means - //! and does an IPC message exchange to register this process with the - //! handler. Crashes will be serviced once this method returns. - //! - //! This method is only defined on Windows. - //! - //! This method sets the unhandled exception handler to a local - //! function that when reached will "signal and wait" for the crash handler - //! process to create the dump. - //! - //! \param[in] ipc_pipe The full name of the crash handler IPC pipe. This is - //! a string of the form `"\\.\pipe\NAME"`. - //! - //! \return `true` on success and `false` on failure. - bool SetHandlerIPCPipe(const std::wstring& ipc_pipe); - - //! \brief Retrieves the IPC pipe name used to register with the Crashpad - //! handler. - //! - //! This method is only defined on Windows. - //! - //! This method retrieves the IPC pipe name set by SetHandlerIPCPipe(), or a - //! suitable IPC pipe name chosen by StartHandler(). It must only be called - //! after a successful call to one of those methods. It is intended to be used - //! to obtain the IPC pipe name so that it may be passed to other processes, - //! so that they may register with an existing Crashpad handler by calling - //! SetHandlerIPCPipe(). - //! - //! \return The full name of the crash handler IPC pipe, a string of the form - //! `"\\.\pipe\NAME"`. - std::wstring GetHandlerIPCPipe() const; - - //! \brief When `asynchronous_start` is used with StartHandler(), this method - //! can be used to block until the handler launch has been completed to - //! retrieve status information. - //! - //! This method should not be used unless `asynchronous_start` was `true`. - //! - //! \param[in] timeout_ms The number of milliseconds to wait for a result from - //! the background launch, or `0xffffffff` to block indefinitely. - //! - //! \return `true` if the hander startup succeeded, `false` otherwise, and an - //! error message will have been logged. - bool WaitForHandlerStart(unsigned int timeout_ms); - - //! \brief Requests that the handler capture a dump even though there hasn't - //! been a crash. - //! - //! \param[in] context A `CONTEXT`, generally captured by CaptureContext() or - //! similar. - static void DumpWithoutCrash(const CONTEXT& context); - - //! \brief Requests that the handler capture a dump using the given \a - //! exception_pointers to get the `EXCEPTION_RECORD` and `CONTEXT`. - //! - //! This function is not necessary in general usage as an unhandled exception - //! filter is installed by StartHandler() or SetHandlerIPCPipe(). - //! - //! \param[in] exception_pointers An `EXCEPTION_POINTERS`, as would generally - //! passed to an unhandled exception filter. - static void DumpAndCrash(EXCEPTION_POINTERS* exception_pointers); - - //! \brief Requests that the handler capture a dump of a different process. - //! - //! The target process must be an already-registered Crashpad client. An - //! exception will be triggered in the target process, and the regular dump - //! mechanism used. This function will block until the exception in the target - //! process has been handled by the Crashpad handler. - //! - //! This function is unavailable when running on Windows XP and will return - //! `false`. - //! - //! \param[in] process A `HANDLE` identifying the process to be dumped. - //! \param[in] blame_thread If non-null, a `HANDLE` valid in the caller's - //! process, referring to a thread in the target process. If this is - //! supplied, instead of the exception referring to the location where the - //! exception was injected, an exception record will be fabricated that - //! refers to the current location of the given thread. - //! \param[in] exception_code If \a blame_thread is non-null, this will be - //! used as the exception code in the exception record. - //! - //! \return `true` if the exception was triggered successfully. - bool DumpAndCrashTargetProcess(HANDLE process, - HANDLE blame_thread, - DWORD exception_code) const; - - enum : uint32_t { - //! \brief The exception code (roughly "Client called") used when - //! DumpAndCrashTargetProcess() triggers an exception in a target - //! process. - //! - //! \note This value does not have any bits of the top nibble set, to avoid - //! confusion with real exception codes which tend to have those bits - //! set. - kTriggeredExceptionCode = 0xcca11ed, - }; -#endif - -#if defined(OS_MACOSX) || DOXYGEN - //! \brief Configures the process to direct its crashes to the default handler - //! for the operating system. - //! - //! On macOS, this sets the task’s exception port as in SetHandlerMachPort(), - //! but the exception handler used is obtained from - //! SystemCrashReporterHandler(). If the system’s crash reporter handler - //! cannot be determined or set, the task’s exception ports for crash-type - //! exceptions are cleared. - //! - //! Use of this function is strongly discouraged. - //! - //! \warning After a call to this function, Crashpad will no longer monitor - //! the process for crashes until a subsequent call to - //! SetHandlerMachPort(). - //! - //! \note This is provided as a static function to allow it to be used in - //! situations where a CrashpadClient object is not otherwise available. - //! This may be useful when a child process inherits its parent’s Crashpad - //! handler, but wants to sever this tie. - static void UseSystemDefaultHandler(); -#endif - - private: -#if defined(OS_MACOSX) - base::mac::ScopedMachSendRight exception_port_; -#elif defined(OS_WIN) - std::wstring ipc_pipe_; - ScopedKernelHANDLE handler_start_thread_; -#endif // OS_MACOSX - - DISALLOW_COPY_AND_ASSIGN(CrashpadClient); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_CRASHPAD_CLIENT_H_ diff --git a/Tools/Crashpad/include/client/crashpad_info.h b/Tools/Crashpad/include/client/crashpad_info.h deleted file mode 100644 index 5db9a6cdff..0000000000 --- a/Tools/Crashpad/include/client/crashpad_info.h +++ /dev/null @@ -1,266 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_CRASHPAD_INFO_H_ -#define CRASHPAD_CLIENT_CRASHPAD_INFO_H_ - -#include - -#include "base/macros.h" -#include "build/build_config.h" -#include "client/annotation_list.h" -#include "client/simple_address_range_bag.h" -#include "client/simple_string_dictionary.h" -#include "util/misc/tri_state.h" - -#if defined(OS_WIN) -#include -#endif // OS_WIN - -namespace crashpad { - -namespace internal { - -//! \brief A linked list of blocks representing custom streams in the minidump, -//! with addresses (and size) stored as uint64_t to simplify reading from -//! the handler process. -struct UserDataMinidumpStreamListEntry { - //! \brief The address of the next entry in the linked list. - uint64_t next; - - //! \brief The base address of the memory block in the target process' address - //! space that represents the user data stream. - uint64_t base_address; - - //! \brief The size of memory block in the target process' address space that - //! represents the user data stream. - uint64_t size; - - //! \brief The stream type identifier. - uint32_t stream_type; -}; - -} // namespace internal - -//! \brief A structure that can be used by a Crashpad-enabled program to -//! provide information to the Crashpad crash handler. -//! -//! It is possible for one CrashpadInfo structure to appear in each loaded code -//! module in a process, but from the perspective of the user of the client -//! interface, there is only one global CrashpadInfo structure, located in the -//! module that contains the client interface code. -struct CrashpadInfo { - public: - //! \brief Returns the global CrashpadInfo structure. - static CrashpadInfo* GetCrashpadInfo(); - - CrashpadInfo(); - - //! \brief Sets the bag of extra memory ranges to be included in the snapshot. - //! - //! Extra memory ranges may exist in \a address_range_bag at the time that - //! this method is called, or they may be added, removed, or modified in \a - //! address_range_bag after this method is called. - //! - //! TODO(scottmg) This is currently only supported on Windows. - //! - //! \param[in] address_range_bag A bag of address ranges. The CrashpadInfo - //! object does not take ownership of the SimpleAddressRangeBag object. - //! It is the caller’s responsibility to ensure that this pointer remains - //! valid while it is in effect for a CrashpadInfo object. - void set_extra_memory_ranges(SimpleAddressRangeBag* address_range_bag) { - extra_memory_ranges_ = address_range_bag; - } - - //! \brief Sets the simple annotations dictionary. - //! - //! Simple annotations set on a CrashpadInfo structure are interpreted by - //! Crashpad as module-level annotations. - //! - //! Annotations may exist in \a simple_annotations at the time that this - //! method is called, or they may be added, removed, or modified in \a - //! simple_annotations after this method is called. - //! - //! \param[in] simple_annotations A dictionary that maps string keys to string - //! values. The CrashpadInfo object does not take ownership of the - //! SimpleStringDictionary object. It is the caller’s responsibility to - //! ensure that this pointer remains valid while it is in effect for a - //! CrashpadInfo object. - //! - //! \sa simple_annotations() - void set_simple_annotations(SimpleStringDictionary* simple_annotations) { - simple_annotations_ = simple_annotations; - } - - //! \return The simple annotations dictionary. - //! - //! \sa set_simple_annotations() - SimpleStringDictionary* simple_annotations() const { - return simple_annotations_; - } - - //! \brief Sets the annotations list. - //! - //! Unlike the \a simple_annotations structure, the \a annotations can - //! typed data and it is not limited to a dictionary form. Annotations are - //! interpreted by Crashpad as module-level annotations. - //! - //! Annotations may exist in \a list at the time that this method is called, - //! or they may be added, removed, or modified in \a list after this method is - //! called. - //! - //! \param[in] list A list of set Annotation objects that maintain arbitrary, - //! typed key-value state. The CrashpadInfo object does not take ownership - //! of the AnnotationsList object. It is the caller’s responsibility to - //! ensure that this pointer remains valid while it is in effect for a - //! CrashpadInfo object. - //! - //! \sa annotations_list() - //! \sa AnnotationList::Register() - void set_annotations_list(AnnotationList* list) { annotations_list_ = list; } - - //! \return The annotations list. - //! - //! \sa set_annotations_list() - //! \sa AnnotationList::Get() - //! \sa AnnotationList::Register() - AnnotationList* annotations_list() const { return annotations_list_; } - - //! \brief Enables or disables Crashpad handler processing. - //! - //! When handling an exception, the Crashpad handler will scan all modules in - //! a process. The first one that has a CrashpadInfo structure populated with - //! a value other than #kUnset for this field will dictate whether the handler - //! is functional or not. If all modules with a CrashpadInfo structure specify - //! #kUnset, the handler will be enabled. If disabled, the Crashpad handler - //! will still run and receive exceptions, but will not take any action on an - //! exception on its own behalf, except for the action necessary to determine - //! that it has been disabled. - //! - //! The Crashpad handler should not normally be disabled. More commonly, it - //! is appropriate to disable crash report upload by calling - //! Settings::SetUploadsEnabled(). - void set_crashpad_handler_behavior(TriState crashpad_handler_behavior) { - crashpad_handler_behavior_ = crashpad_handler_behavior; - } - - //! \brief Enables or disables Crashpad forwarding of exceptions to the - //! system’s crash reporter. - //! - //! When handling an exception, the Crashpad handler will scan all modules in - //! a process. The first one that has a CrashpadInfo structure populated with - //! a value other than #kUnset for this field will dictate whether the - //! exception is forwarded to the system’s crash reporter. If all modules with - //! a CrashpadInfo structure specify #kUnset, forwarding will be enabled. - //! Unless disabled, forwarding may still occur if the Crashpad handler is - //! disabled by SetCrashpadHandlerState(). Even when forwarding is enabled, - //! the Crashpad handler may choose not to forward all exceptions to the - //! system’s crash reporter in cases where it has reason to believe that the - //! system’s crash reporter would not normally have handled the exception in - //! Crashpad’s absence. - void set_system_crash_reporter_forwarding( - TriState system_crash_reporter_forwarding) { - system_crash_reporter_forwarding_ = system_crash_reporter_forwarding; - } - - //! \brief Enables or disables Crashpad capturing indirectly referenced memory - //! in the minidump. - //! - //! When handling an exception, the Crashpad handler will scan all modules in - //! a process. The first one that has a CrashpadInfo structure populated with - //! a value other than #kUnset for this field will dictate whether the extra - //! memory is captured. - //! - //! This causes Crashpad to include pages of data referenced by locals or - //! other stack memory. Turning this on can increase the size of the minidump - //! significantly. - //! - //! \param[in] gather_indirectly_referenced_memory Whether extra memory should - //! be gathered. - //! \param[in] limit The amount of memory in bytes after which no more - //! indirectly gathered memory should be captured. This value is only used - //! when \a gather_indirectly_referenced_memory is TriState::kEnabled. - void set_gather_indirectly_referenced_memory( - TriState gather_indirectly_referenced_memory, - uint32_t limit) { - gather_indirectly_referenced_memory_ = gather_indirectly_referenced_memory; - indirectly_referenced_memory_cap_ = limit; - } - - //! \brief Adds a custom stream to the minidump. - //! - //! The memory block referenced by \a data and \a size will added to the - //! minidump as separate stream with type \a stream_type. The memory referred - //! to by \a data and \a size is owned by the caller and must remain valid - //! while it is in effect for the CrashpadInfo object. - //! - //! Note that streams will appear in the minidump in the reverse order to - //! which they are added. - //! - //! TODO(scottmg) This is currently only supported on Windows. - //! - //! \param[in] stream_type The stream type identifier to use. This should be - //! normally be larger than `MINIDUMP_STREAM_TYPE::LastReservedStream` - //! which is `0xffff`. - //! \param[in] data The base pointer of the stream data. - //! \param[in] size The size of the stream data. - void AddUserDataMinidumpStream(uint32_t stream_type, - const void* data, - size_t size); - - enum : uint32_t { - kSignature = 'CPad', - }; - - private: - // The compiler won’t necessarily see anyone using these fields, but it - // shouldn’t warn about that. These fields aren’t intended for use by the - // process they’re found in, they’re supposed to be read by the crash - // reporting process. -#if defined(__clang__) -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-private-field" -#endif - - // Fields present in version 1, subject to a check of the size_ field: - uint32_t signature_; // kSignature - uint32_t size_; // The size of the entire CrashpadInfo structure. - uint32_t version_; // kCrashpadInfoVersion - uint32_t indirectly_referenced_memory_cap_; - uint32_t padding_0_; - TriState crashpad_handler_behavior_; - TriState system_crash_reporter_forwarding_; - TriState gather_indirectly_referenced_memory_; - uint8_t padding_1_; - SimpleAddressRangeBag* extra_memory_ranges_; // weak - SimpleStringDictionary* simple_annotations_; // weak - internal::UserDataMinidumpStreamListEntry* user_data_minidump_stream_head_; - AnnotationList* annotations_list_; // weak - - // It’s generally safe to add new fields without changing - // kCrashpadInfoVersion, because readers should check size_ and ignore fields - // that aren’t present, as well as unknown fields. - // - // Adding fields? Consider snapshot/crashpad_info_size_test_module.cc too. - -#if defined(__clang__) -#pragma clang diagnostic pop -#endif - - DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ diff --git a/Tools/Crashpad/include/client/prune_crash_reports.h b/Tools/Crashpad/include/client/prune_crash_reports.h deleted file mode 100644 index 6dac5f3002..0000000000 --- a/Tools/Crashpad/include/client/prune_crash_reports.h +++ /dev/null @@ -1,148 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ -#define CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ - -#include -#include - -#include - -#include "base/macros.h" -#include "client/crash_report_database.h" - -namespace crashpad { - -class PruneCondition; - -//! \brief Deletes crash reports from \a database that match \a condition. -//! -//! This function can be used to remove old or large reports from the database. -//! The \a condition will be evaluated against each report in the \a database, -//! sorted in descending order by CrashReportDatabase::Report::creation_time. -//! This guarantee allows conditions to be stateful. -//! -//! \param[in] database The database from which crash reports will be deleted. -//! \param[in] condition The condition against which all reports in the database -//! will be evaluated. -void PruneCrashReportDatabase(CrashReportDatabase* database, - PruneCondition* condition); - -std::unique_ptr GetDefaultDatabasePruneCondition(); - -//! \brief An abstract base class for evaluating crash reports for deletion. -//! -//! When passed to PruneCrashReportDatabase(), each crash report in the -//! database will be evaluated according to ShouldPruneReport(). The reports -//! are evaluated serially in descending sort order by -//! CrashReportDatabase::Report::creation_time. -class PruneCondition { - public: - //! \brief Returns a sensible default condition for removing obsolete crash - //! reports. - //! - //! The default is to keep reports for one year or a maximum database size - //! of 128 MB. - //! - //! \return A PruneCondition for use with PruneCrashReportDatabase(). - static std::unique_ptr GetDefault(); - - virtual ~PruneCondition() {} - - //! \brief Evaluates a crash report for deletion. - //! - //! \param[in] report The crash report to evaluate. - //! - //! \return `true` if the crash report should be deleted, `false` if it - //! should be kept. - virtual bool ShouldPruneReport(const CrashReportDatabase::Report& report) = 0; -}; - -//! \brief A PruneCondition that deletes reports older than the specified number -//! days. -class AgePruneCondition final : public PruneCondition { - public: - //! \brief Creates a PruneCondition based on Report::creation_time. - //! - //! \param[in] max_age_in_days Reports created more than this many days ago - //! will be deleted. - explicit AgePruneCondition(int max_age_in_days); - ~AgePruneCondition(); - - bool ShouldPruneReport(const CrashReportDatabase::Report& report) override; - - private: - const time_t oldest_report_time_; - - DISALLOW_COPY_AND_ASSIGN(AgePruneCondition); -}; - -//! \brief A PruneCondition that deletes older reports to keep the total -//! Crashpad database size under the specified limit. -class DatabaseSizePruneCondition final : public PruneCondition { - public: - //! \brief Creates a PruneCondition that will keep newer reports, until the - //! sum of the size of all reports is not smaller than \a max_size_in_kb. - //! After the limit is reached, older reports will be pruned. - //! - //! \param[in] max_size_in_kb The maximum number of kilobytes that all crash - //! reports should consume. - explicit DatabaseSizePruneCondition(size_t max_size_in_kb); - ~DatabaseSizePruneCondition(); - - bool ShouldPruneReport(const CrashReportDatabase::Report& report) override; - - private: - const size_t max_size_in_kb_; - size_t measured_size_in_kb_; - - DISALLOW_COPY_AND_ASSIGN(DatabaseSizePruneCondition); -}; - -//! \brief A PruneCondition that conjoins two other PruneConditions. -class BinaryPruneCondition final : public PruneCondition { - public: - enum Operator { - AND, - OR, - }; - - //! \brief Evaluates two sub-conditions according to the specified logical - //! operator. - //! - //! This implements left-to-right evaluation. For Operator::AND, this means - //! if the \a lhs is `false`, the \a rhs will not be consulted. Similarly, - //! with Operator::OR, if the \a lhs is `true`, the \a rhs will not be - //! consulted. - //! - //! \param[in] op The logical operator to apply on \a lhs and \a rhs. - //! \param[in] lhs The left-hand side of \a op. This class takes ownership. - //! \param[in] rhs The right-hand side of \a op. This class takes ownership. - BinaryPruneCondition(Operator op, PruneCondition* lhs, PruneCondition* rhs); - ~BinaryPruneCondition(); - - bool ShouldPruneReport(const CrashReportDatabase::Report& report) override; - - private: - const Operator op_; - std::unique_ptr lhs_; - std::unique_ptr rhs_; - - DISALLOW_COPY_AND_ASSIGN(BinaryPruneCondition); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ diff --git a/Tools/Crashpad/include/client/settings.h b/Tools/Crashpad/include/client/settings.h deleted file mode 100644 index b64f74fbaf..0000000000 --- a/Tools/Crashpad/include/client/settings.h +++ /dev/null @@ -1,183 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SETTINGS_H_ -#define CRASHPAD_CLIENT_SETTINGS_H_ - -#include - -#include - -#include "base/files/file_path.h" -#include "base/macros.h" -#include "base/scoped_generic.h" -#include "util/file/file_io.h" -#include "util/misc/initialization_state.h" -#include "util/misc/uuid.h" - -namespace crashpad { - -namespace internal { - -struct ScopedLockedFileHandleTraits { - static FileHandle InvalidValue() { return kInvalidFileHandle; } - static void Free(FileHandle handle); -}; - -} // namespace internal - -//! \brief An interface for accessing and modifying the settings of a -//! CrashReportDatabase. -//! -//! This class must not be instantiated directly, but rather an instance of it -//! should be retrieved via CrashReportDatabase::GetSettings(). -class Settings { - public: - explicit Settings(const base::FilePath& file_path); - ~Settings(); - - bool Initialize(); - - //! \brief Retrieves the immutable identifier for this client, which is used - //! on a server to locate all crash reports from a specific Crashpad - //! database. - //! - //! This is automatically initialized when the database is created. - //! - //! \param[out] client_id The unique client identifier. - //! - //! \return On success, returns `true`, otherwise returns `false` with an - //! error logged. - bool GetClientID(UUID* client_id); - - //! \brief Retrieves the user’s preference for submitting crash reports to a - //! collection server. - //! - //! The default value is `false`. - //! - //! \param[out] enabled Whether crash reports should be uploaded. - //! - //! \return On success, returns `true`, otherwise returns `false` with an - //! error logged. - bool GetUploadsEnabled(bool* enabled); - - //! \brief Sets the user’s preference for submitting crash reports to a - //! collection server. - //! - //! \param[in] enabled Whether crash reports should be uploaded. - //! - //! \return On success, returns `true`, otherwise returns `false` with an - //! error logged. - bool SetUploadsEnabled(bool enabled); - - //! \brief Retrieves the last time at which a report was attempted to be - //! uploaded. - //! - //! The default value is `0` if it has never been set before. - //! - //! \param[out] time The last time at which a report was uploaded. - //! - //! \return On success, returns `true`, otherwise returns `false` with an - //! error logged. - bool GetLastUploadAttemptTime(time_t* time); - - //! \brief Sets the last time at which a report was attempted to be uploaded. - //! - //! This is only meant to be used internally by the CrashReportDatabase. - //! - //! \param[in] time The last time at which a report was uploaded. - //! - //! \return On success, returns `true`, otherwise returns `false` with an - //! error logged. - bool SetLastUploadAttemptTime(time_t time); - - private: - struct Data; - - // This must be constructed with MakeScopedLockedFileHandle(). It both unlocks - // and closes the file on destruction. - using ScopedLockedFileHandle = - base::ScopedGeneric; - static ScopedLockedFileHandle MakeScopedLockedFileHandle(FileHandle file, - FileLocking locking); - - // Opens the settings file for reading. On error, logs a message and returns - // the invalid handle. - ScopedLockedFileHandle OpenForReading(); - - // Opens the settings file for reading and writing. On error, logs a message - // and returns the invalid handle. |mode| determines how the file will be - // opened. |mode| must not be FileWriteMode::kTruncateOrCreate. - // - // If |log_open_error| is false, nothing will be logged for an error - // encountered when attempting to open the file, but this method will still - // return false. This is intended to be used to suppress error messages when - // attempting to create a new settings file when multiple attempts are made. - ScopedLockedFileHandle OpenForReadingAndWriting(FileWriteMode mode, - bool log_open_error); - - // Opens the settings file and reads the data. If that fails, an error will - // be logged and the settings will be recovered and re-initialized. If that - // also fails, returns false with additional log data from recovery. - bool OpenAndReadSettings(Data* out_data); - - // Opens the settings file for writing and reads the data. If reading fails, - // recovery is attempted. Returns the opened file handle on success, or the - // invalid file handle on failure, with an error logged. - ScopedLockedFileHandle OpenForWritingAndReadSettings(Data* out_data); - - // Reads the settings from |handle|. Logs an error and returns false on - // failure. This does not perform recovery. - // - // |handle| must be the result of OpenForReading() or - // OpenForReadingAndWriting(). - // - // If |log_read_error| is false, nothing will be logged for a read error, but - // this method will still return false. This is intended to be used to - // suppress error messages when attempting to read a newly created settings - // file. - bool ReadSettings(FileHandle handle, Data* out_data, bool log_read_error); - - // Writes the settings to |handle|. Logs an error and returns false on - // failure. This does not perform recovery. - // - // |handle| must be the result of OpenForReadingAndWriting(). - bool WriteSettings(FileHandle handle, const Data& data); - - // Recovers the settings file by re-initializing the data. If |handle| is the - // invalid handle, this will open the file; if it is not, then it must be the - // result of OpenForReadingAndWriting(). If the invalid handle is passed, the - // caller must not be holding the handle. The new settings data are stored in - // |out_data|. Returns true on success and false on failure, with an error - // logged. - bool RecoverSettings(FileHandle handle, Data* out_data); - - // Initializes a settings file and writes the data to |handle|. Returns true - // on success and false on failure, with an error logged. - // - // |handle| must be the result of OpenForReadingAndWriting(). - bool InitializeSettings(FileHandle handle); - - const base::FilePath& file_path() const { return file_path_; } - - base::FilePath file_path_; - - InitializationState initialized_; - - DISALLOW_COPY_AND_ASSIGN(Settings); -}; - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_SETTINGS_H_ diff --git a/Tools/Crashpad/include/client/simple_address_range_bag.h b/Tools/Crashpad/include/client/simple_address_range_bag.h deleted file mode 100644 index c69fa5afd8..0000000000 --- a/Tools/Crashpad/include/client/simple_address_range_bag.h +++ /dev/null @@ -1,198 +0,0 @@ -// Copyright 2016 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_ -#define CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_ - -#include - -#include - -#include "base/logging.h" -#include "base/macros.h" -#include "base/numerics/safe_conversions.h" -#include "util/misc/from_pointer_cast.h" -#include "util/numeric/checked_range.h" - -namespace crashpad { - -//! \brief A bag implementation using a fixed amount of storage, so that it does -//! not perform any dynamic allocations for its operations. -//! -//! The actual bag storage (TSimpleAddressRangeBag::Entry) is POD, so that it -//! can be transmitted over various IPC mechanisms. -template -class TSimpleAddressRangeBag { - public: - //! Constant and publicly accessible version of the template parameter. - static const size_t num_entries = NumEntries; - - //! \brief A single entry in the bag. - struct Entry { - //! \brief The base address of the range. - uint64_t base; - - //! \brief The size of the range in bytes. - uint64_t size; - - //! \brief Returns the validity of the entry. - //! - //! If #base and #size are both zero, the entry is considered inactive, and - //! this method returns `false`. Otherwise, returns `true`. - bool is_active() const { - return base != 0 || size != 0; - } - }; - - //! \brief An iterator to traverse all of the active entries in a - //! TSimpleAddressRangeBag. - class Iterator { - public: - explicit Iterator(const TSimpleAddressRangeBag& bag) - : bag_(bag), - current_(0) { - } - - //! \brief Returns the next entry in the bag, or `nullptr` if at the end of - //! the collection. - const Entry* Next() { - while (current_ < bag_.num_entries) { - const Entry* entry = &bag_.entries_[current_++]; - if (entry->is_active()) { - return entry; - } - } - return nullptr; - } - - private: - const TSimpleAddressRangeBag& bag_; - size_t current_; - - DISALLOW_COPY_AND_ASSIGN(Iterator); - }; - - TSimpleAddressRangeBag() - : entries_() { - } - - TSimpleAddressRangeBag(const TSimpleAddressRangeBag& other) { - *this = other; - } - - TSimpleAddressRangeBag& operator=(const TSimpleAddressRangeBag& other) { - memcpy(entries_, other.entries_, sizeof(entries_)); - return *this; - } - - //! \brief Returns the number of active entries. The upper limit for this is - //! \a NumEntries. - size_t GetCount() const { - size_t count = 0; - for (size_t i = 0; i < num_entries; ++i) { - if (entries_[i].is_active()) { - ++count; - } - } - return count; - } - - //! \brief Inserts the given range into the bag. Duplicates and overlapping - //! ranges are supported and allowed, but not coalesced. - //! - //! \param[in] range The range to be inserted. The range must have either a - //! non-zero base address or size. - //! - //! \return `true` if there was space to insert the range into the bag, - //! otherwise `false` with an error logged. - bool Insert(CheckedRange range) { - DCHECK(range.base() != 0 || range.size() != 0); - - for (size_t i = 0; i < num_entries; ++i) { - if (!entries_[i].is_active()) { - entries_[i].base = range.base(); - entries_[i].size = range.size(); - return true; - } - } - - LOG(ERROR) << "no space available to insert range"; - return false; - } - - //! \brief Inserts the given range into the bag. Duplicates and overlapping - //! ranges are supported and allowed, but not coalesced. - //! - //! \param[in] base The base of the range to be inserted. May not be null. - //! \param[in] size The size of the range to be inserted. May not be zero. - //! - //! \return `true` if there was space to insert the range into the bag, - //! otherwise `false` with an error logged. - bool Insert(void* base, size_t size) { - DCHECK(base != nullptr); - DCHECK_NE(0u, size); - return Insert(CheckedRange(FromPointerCast(base), - base::checked_cast(size))); - } - - //! \brief Removes the given range from the bag. - //! - //! \param[in] range The range to be removed. The range must have either a - //! non-zero base address or size. - //! - //! \return `true` if the range was found and removed, otherwise `false` with - //! an error logged. - bool Remove(CheckedRange range) { - DCHECK(range.base() != 0 || range.size() != 0); - - for (size_t i = 0; i < num_entries; ++i) { - if (entries_[i].base == range.base() && - entries_[i].size == range.size()) { - entries_[i].base = entries_[i].size = 0; - return true; - } - } - - LOG(ERROR) << "did not find range to remove"; - return false; - } - - //! \brief Removes the given range from the bag. - //! - //! \param[in] base The base of the range to be removed. May not be null. - //! \param[in] size The size of the range to be removed. May not be zero. - //! - //! \return `true` if the range was found and removed, otherwise `false` with - //! an error logged. - bool Remove(void* base, size_t size) { - DCHECK(base != nullptr); - DCHECK_NE(0u, size); - return Remove(CheckedRange(FromPointerCast(base), - base::checked_cast(size))); - } - - - private: - Entry entries_[NumEntries]; -}; - -//! \brief A TSimpleAddressRangeBag with default template parameters. -using SimpleAddressRangeBag = TSimpleAddressRangeBag<64>; - -static_assert(std::is_standard_layout::value, - "SimpleAddressRangeBag must be standard layout"); - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_SIMPLE_ADDRESS_RANGE_BAG_H_ diff --git a/Tools/Crashpad/include/client/simple_string_dictionary.h b/Tools/Crashpad/include/client/simple_string_dictionary.h deleted file mode 100644 index 0e97736163..0000000000 --- a/Tools/Crashpad/include/client/simple_string_dictionary.h +++ /dev/null @@ -1,288 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ -#define CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ - -#include -#include - -#include -#include - -#include "base/logging.h" -#include "base/macros.h" -#include "base/strings/string_piece.h" -#include "util/misc/implicit_cast.h" - -namespace crashpad { - -//! \brief A map/dictionary collection implementation using a fixed amount of -//! storage, so that it does not perform any dynamic allocations for its -//! operations. -//! -//! The actual map storage (TSimpleStringDictionary::Entry) is guaranteed to be -//! POD, so that it can be transmitted over various IPC mechanisms. -//! -//! The template parameters control the amount of storage used for the key, -//! value, and map. The \a KeySize and \a ValueSize are measured in bytes, not -//! glyphs, and include space for a trailing `NUL` byte. This gives space for -//! `KeySize - 1` and `ValueSize - 1` characters in an entry. \a NumEntries is -//! the total number of entries that will fit in the map. -template -class TSimpleStringDictionary { - public: - //! \brief Constant and publicly accessible versions of the template - //! parameters. - //! \{ - static const size_t key_size = KeySize; - static const size_t value_size = ValueSize; - static const size_t num_entries = NumEntries; - //! \} - - //! \brief A single entry in the map. - struct Entry { - //! \brief The entry’s key. - //! - //! This string is always `NUL`-terminated. If this is a 0-length - //! `NUL`-terminated string, the entry is inactive. - char key[KeySize]; - - //! \brief The entry’s value. - //! - //! This string is always `NUL`-terminated. - char value[ValueSize]; - - //! \brief Returns the validity of the entry. - //! - //! If #key is an empty string, the entry is considered inactive, and this - //! method returns `false`. Otherwise, returns `true`. - bool is_active() const { - return key[0] != '\0'; - } - }; - - //! \brief An iterator to traverse all of the active entries in a - //! TSimpleStringDictionary. - class Iterator { - public: - explicit Iterator(const TSimpleStringDictionary& map) - : map_(map), - current_(0) { - } - - //! \brief Returns the next entry in the map, or `nullptr` if at the end of - //! the collection. - const Entry* Next() { - while (current_ < map_.num_entries) { - const Entry* entry = &map_.entries_[current_++]; - if (entry->is_active()) { - return entry; - } - } - return nullptr; - } - - private: - const TSimpleStringDictionary& map_; - size_t current_; - - DISALLOW_COPY_AND_ASSIGN(Iterator); - }; - - TSimpleStringDictionary() - : entries_() { - } - - TSimpleStringDictionary(const TSimpleStringDictionary& other) { - *this = other; - } - - TSimpleStringDictionary& operator=(const TSimpleStringDictionary& other) { - memcpy(entries_, other.entries_, sizeof(entries_)); - return *this; - } - - //! \brief Returns the number of active key/value pairs. The upper limit for - //! this is \a NumEntries. - size_t GetCount() const { - size_t count = 0; - for (size_t i = 0; i < num_entries; ++i) { - if (entries_[i].is_active()) { - ++count; - } - } - return count; - } - - //! \brief Given \a key, returns its corresponding value. - //! - //! \param[in] key The key to look up. This must not be `nullptr`, nor an - //! empty string. It must not contain embedded `NUL`s. - //! - //! \return The corresponding value for \a key, or if \a key is not found, - //! `nullptr`. - const char* GetValueForKey(base::StringPiece key) const { - DCHECK(key.data()); - DCHECK(key.size()); - DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos); - if (!key.data() || !key.size()) { - return nullptr; - } - - const Entry* entry = GetConstEntryForKey(key); - if (!entry) { - return nullptr; - } - - return entry->value; - } - - //! \brief Stores \a value into \a key, replacing the existing value if \a key - //! is already present. - //! - //! If \a key is not yet in the map and the map is already full (containing - //! \a NumEntries active entries), this operation silently fails. - //! - //! \param[in] key The key to store. This must not be `nullptr`, nor an empty - //! string. It must not contain embedded `NUL`s. - //! \param[in] value The value to store. If `nullptr`, \a key is removed from - //! the map. Must not contain embedded `NUL`s. - void SetKeyValue(base::StringPiece key, base::StringPiece value) { - if (!value.data()) { - RemoveKey(key); - return; - } - - DCHECK(key.data()); - DCHECK(key.size()); - DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos); - if (!key.data() || !key.size()) { - return; - } - - // |key| must not be an empty string. - DCHECK_NE(key[0], '\0'); - if (key[0] == '\0') { - return; - } - - // |value| must not contain embedded NULs. - DCHECK_EQ(value.find('\0', 0), base::StringPiece::npos); - - Entry* entry = GetEntryForKey(key); - - // If it does not yet exist, attempt to insert it. - if (!entry) { - for (size_t i = 0; i < num_entries; ++i) { - if (!entries_[i].is_active()) { - entry = &entries_[i]; - SetFromStringPiece(key, entry->key, key_size); - break; - } - } - } - - // If the map is out of space, |entry| will be nullptr. - if (!entry) { - return; - } - -#ifndef NDEBUG - // Sanity check that the key only appears once. - int count = 0; - for (size_t i = 0; i < num_entries; ++i) { - if (EntryKeyEquals(key, entries_[i])) { - ++count; - } - } - DCHECK_EQ(count, 1); -#endif - - SetFromStringPiece(value, entry->value, value_size); - } - - //! \brief Removes \a key from the map. - //! - //! If \a key is not found, this is a no-op. - //! - //! \param[in] key The key of the entry to remove. This must not be `nullptr`, - //! nor an empty string. It must not contain embedded `NUL`s. - void RemoveKey(base::StringPiece key) { - DCHECK(key.data()); - DCHECK(key.size()); - DCHECK_EQ(key.find('\0', 0), base::StringPiece::npos); - if (!key.data() || !key.size()) { - return; - } - - Entry* entry = GetEntryForKey(key); - if (entry) { - entry->key[0] = '\0'; - entry->value[0] = '\0'; - } - - DCHECK_EQ(GetEntryForKey(key), implicit_cast(nullptr)); - } - - private: - static void SetFromStringPiece(base::StringPiece src, - char* dst, - size_t dst_size) { - size_t copy_len = std::min(dst_size - 1, src.size()); - src.copy(dst, copy_len); - dst[copy_len] = '\0'; - } - - static bool EntryKeyEquals(base::StringPiece key, const Entry& entry) { - if (key.size() >= KeySize) - return false; - - // Test for a NUL terminator and early out if it's absent. - if (entry.key[key.size()] != '\0') - return false; - - // As there's a NUL terminator at the right position in the entries - // string, strncmp can do the rest. - return strncmp(key.data(), entry.key, key.size()) == 0; - } - - const Entry* GetConstEntryForKey(base::StringPiece key) const { - for (size_t i = 0; i < num_entries; ++i) { - if (EntryKeyEquals(key, entries_[i])) { - return &entries_[i]; - } - } - return nullptr; - } - - Entry* GetEntryForKey(base::StringPiece key) { - return const_cast(GetConstEntryForKey(key)); - } - - Entry entries_[NumEntries]; -}; - -//! \brief A TSimpleStringDictionary with default template parameters. -//! -//! For historical reasons this specialized version is available with the same -//! size factors as a previous implementation. -using SimpleStringDictionary = TSimpleStringDictionary<256, 256, 64>; - -static_assert(std::is_standard_layout::value, - "SimpleStringDictionary must be standard layout"); - -} // namespace crashpad - -#endif // CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ diff --git a/Tools/Crashpad/include/client/simulate_crash.h b/Tools/Crashpad/include/client/simulate_crash.h deleted file mode 100644 index 299fe97cf5..0000000000 --- a/Tools/Crashpad/include/client/simulate_crash.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_H_ -#define CRASHPAD_CLIENT_SIMULATE_CRASH_H_ - -#include "build/build_config.h" - -#if defined(OS_MACOSX) -#include "client/simulate_crash_mac.h" -#elif defined(OS_WIN) -#include "client/simulate_crash_win.h" -#endif - -#endif // CRASHPAD_CLIENT_SIMULATE_CRASH_H_ diff --git a/Tools/Crashpad/include/client/simulate_crash_mac.h b/Tools/Crashpad/include/client/simulate_crash_mac.h deleted file mode 100644 index e14db3c9b4..0000000000 --- a/Tools/Crashpad/include/client/simulate_crash_mac.h +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_ -#define CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_ - -#include - -#include "client/capture_context_mac.h" - -//! \file - -namespace crashpad { - -//! \brief Simulates a exception without crashing. -//! -//! This function searches for an `EXC_CRASH` handler in the same manner that -//! the kernel does, and sends it an exception message to that handler in the -//! format that the handler expects, considering the behavior and thread state -//! flavor that are registered for it. The exception sent to the handler will be -//! ::kMachExceptionSimulated, not `EXC_CRASH`. -//! -//! Typically, the CRASHPAD_SIMULATE_CRASH() macro will be used in preference to -//! this function, because it combines the context-capture operation with the -//! raising of a simulated exception. -//! -//! This function returns normally after the exception message is processed. If -//! no valid handler was found, or no handler processed the exception -//! successfully, a warning will be logged, but these conditions are not -//! considered fatal. -//! -//! \param[in] cpu_context The thread state to pass to the exception handler as -//! the exception context, provided that it is compatible with the thread -//! state flavor that the exception handler accepts. If it is not -//! compatible, the correct thread state for the handler will be obtained by -//! calling `thread_get_state()`. -void SimulateCrash(const NativeCPUContext& cpu_context); - -} // namespace crashpad - -//! \brief Captures the CPU context and simulates an exception without crashing. -#define CRASHPAD_SIMULATE_CRASH() \ - do { \ - crashpad::NativeCPUContext cpu_context; \ - crashpad::CaptureContext(&cpu_context); \ - crashpad::SimulateCrash(cpu_context); \ - } while (false) - -#endif // CRASHPAD_CLIENT_SIMULATE_CRASH_MAC_H_ diff --git a/Tools/Crashpad/include/client/simulate_crash_win.h b/Tools/Crashpad/include/client/simulate_crash_win.h deleted file mode 100644 index a20f3dad62..0000000000 --- a/Tools/Crashpad/include/client/simulate_crash_win.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_ -#define CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_ - -#include - -#include "client/crashpad_client.h" -#include "util/win/capture_context.h" - -//! \file - -//! \brief Captures the CPU context and captures a dump without an exception. -#define CRASHPAD_SIMULATE_CRASH() \ - do { \ - CONTEXT context; \ - crashpad::CaptureContext(&context); \ - crashpad::CrashpadClient::DumpWithoutCrash(context); \ - } while (false) - -#endif // CRASHPAD_CLIENT_SIMULATE_CRASH_WIN_H_ diff --git a/Tools/Crashpad/include/compat/android/dlfcn_internal.h b/Tools/Crashpad/include/compat/android/dlfcn_internal.h deleted file mode 100644 index ed4083dbc8..0000000000 --- a/Tools/Crashpad/include/compat/android/dlfcn_internal.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_ -#define CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_ - -namespace crashpad { -namespace internal { - -//! \brief Provide a wrapper for `dlsym`. -//! -//! dlsym on Android KitKat (4.4.*) raises SIGFPE when searching for a -//! non-existent symbol. This wrapper avoids crashing in this circumstance. -//! https://code.google.com/p/android/issues/detail?id=61799 -//! -//! The parameters and return value for this function are the same as for -//! `dlsym`, but a return value for `dlerror` may not be set in the event of an -//! error. -void* Dlsym(void* handle, const char* symbol); - -} // namespace internal -} // namespace crashpad - -#endif // CRASHPAD_COMPAT_ANDROID_DLFCN_INTERNAL_H_ diff --git a/Tools/Crashpad/include/compat/android/elf.h b/Tools/Crashpad/include/compat/android/elf.h deleted file mode 100644 index 9fa923875b..0000000000 --- a/Tools/Crashpad/include/compat/android/elf.h +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_ELF_H_ -#define CRASHPAD_COMPAT_ANDROID_ELF_H_ - -#include_next - -#include - -#if !defined(ELF32_ST_VISIBILITY) -#define ELF32_ST_VISIBILITY(other) ((other) & 0x3) -#endif - -#if !defined(ELF64_ST_VISIBILITY) -#define ELF64_ST_VISIBILITY(other) ELF32_ST_VISIBILITY(other) -#endif - -// Android 5.0.0 (API 21) NDK - -#if !defined(STT_COMMON) -#define STT_COMMON 5 -#endif - -#if !defined(STT_TLS) -#define STT_TLS 6 -#endif - -// ELF note header types are normally provided by . While unified -// headers include in , traditional headers do not, prior -// to API 21. and can't both be included in the same -// translation unit due to collisions, so we provide these types here. -#if __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__) -typedef struct { - Elf32_Word n_namesz; - Elf32_Word n_descsz; - Elf32_Word n_type; -} Elf32_Nhdr; - -typedef struct { - Elf64_Word n_namesz; - Elf64_Word n_descsz; - Elf64_Word n_type; -} Elf64_Nhdr; -#endif // __ANDROID_API__ < 21 && !defined(NT_PRSTATUS) - -#endif // CRASHPAD_COMPAT_ANDROID_ELF_H_ diff --git a/Tools/Crashpad/include/compat/android/linux/elf.h b/Tools/Crashpad/include/compat/android/linux/elf.h deleted file mode 100644 index e65d15327c..0000000000 --- a/Tools/Crashpad/include/compat/android/linux/elf.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_ -#define CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_ - -#include_next - -// Android 5.0.0 (API 21) NDK - -#if defined(__i386__) || defined(__x86_64__) -#if !defined(NT_386_TLS) -#define NT_386_TLS 0x200 -#endif -#endif // __i386__ || __x86_64__ - -#if defined(__ARMEL__) || defined(__aarch64__) -#if !defined(NT_ARM_VFP) -#define NT_ARM_VFP 0x400 -#endif - -#if !defined(NT_ARM_TLS) -#define NT_ARM_TLS 0x401 -#endif -#endif // __ARMEL__ || __aarch64__ - -#endif // CRASHPAD_COMPAT_ANDROID_LINUX_ELF_H_ diff --git a/Tools/Crashpad/include/compat/android/linux/prctl.h b/Tools/Crashpad/include/compat/android/linux/prctl.h deleted file mode 100644 index 046f900f0a..0000000000 --- a/Tools/Crashpad/include/compat/android/linux/prctl.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_ -#define CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_ - -#include_next - -// Android 5.0.0 (API 21) NDK -#if !defined(PR_SET_PTRACER) -#define PR_SET_PTRACER 0x59616d61 -#endif - -#endif // CRASHPAD_COMPAT_ANDROID_LINUX_PRCTL_H_ diff --git a/Tools/Crashpad/include/compat/android/linux/ptrace.h b/Tools/Crashpad/include/compat/android/linux/ptrace.h deleted file mode 100644 index 7db46aa3f1..0000000000 --- a/Tools/Crashpad/include/compat/android/linux/ptrace.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_ -#define CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_ - -#include_next - -// Android 5.0.0 (API 21) NDK -#if !defined(PTRACE_GETREGSET) -#define PTRACE_GETREGSET 0x4204 -#endif - -#endif // CRASHPAD_COMPAT_ANDROID_LINUX_PTRACE_H_ diff --git a/Tools/Crashpad/include/compat/android/sched.h b/Tools/Crashpad/include/compat/android/sched.h deleted file mode 100644 index c4a027ae48..0000000000 --- a/Tools/Crashpad/include/compat/android/sched.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_SCHED_H_ -#define CRASHPAD_COMPAT_ANDROID_SCHED_H_ - -#include_next - -// Android 5.0.0 (API 21) NDK - -#if !defined(SCHED_BATCH) -#define SCHED_BATCH 3 -#endif - -#if !defined(SCHED_IDLE) -#define SCHED_IDLE 5 -#endif - -#endif // CRASHPAD_COMPAT_ANDROID_SCHED_H_ diff --git a/Tools/Crashpad/include/compat/android/sys/epoll.h b/Tools/Crashpad/include/compat/android/sys/epoll.h deleted file mode 100644 index 387813e6a5..0000000000 --- a/Tools/Crashpad/include/compat/android/sys/epoll.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_ -#define CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_ - -#include_next - -#include -#include - -// This is missing from traditional headers before API 21. -#if !defined(EPOLLRDHUP) -#define EPOLLRDHUP 0x00002000 -#endif - -// EPOLL_CLOEXEC is undefined in traditional headers before API 21 and removed -// from unified headers at API levels < 21 as a means to indicate that -// epoll_create1 is missing from the C library, but the raw system call should -// still be available. -#if !defined(EPOLL_CLOEXEC) -#define EPOLL_CLOEXEC O_CLOEXEC -#endif - -#if __ANDROID_API__ < 21 - -#ifdef __cplusplus -extern "C" { -#endif - -int epoll_create1(int flags); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // __ANDROID_API__ < 21 - -#endif // CRASHPAD_COMPAT_ANDROID_SYS_EPOLL_H_ diff --git a/Tools/Crashpad/include/compat/android/sys/mman.h b/Tools/Crashpad/include/compat/android/sys/mman.h deleted file mode 100644 index 5e7cd69f18..0000000000 --- a/Tools/Crashpad/include/compat/android/sys/mman.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_ -#define CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_ - -#include_next - -#include -#include - -// There’s no mmap() wrapper compatible with a 64-bit off_t for 32-bit code -// until API 21 (Android 5.0/“Lollipop”). A custom mmap() wrapper is provided -// here. Note that this scenario is only possible with NDK unified headers. -// -// https://android.googlesource.com/platform/bionic/+/0bfcbaf4d069e005d6e959d97f8d11c77722b70d/docs/32-bit-abi.md#is-32_bit-1 - -#if defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 21 - -#ifdef __cplusplus -extern "C" { -#endif - -void* mmap(void* addr, size_t size, int prot, int flags, int fd, off_t offset); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // defined(__USE_FILE_OFFSET64) && __ANDROID_API__ < 21 - -#endif // CRASHPAD_COMPAT_ANDROID_SYS_MMAN_H_ diff --git a/Tools/Crashpad/include/compat/android/sys/syscall.h b/Tools/Crashpad/include/compat/android/sys/syscall.h deleted file mode 100644 index facce20f79..0000000000 --- a/Tools/Crashpad/include/compat/android/sys/syscall.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_ -#define CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_ - -#include_next - -// Android 5.0.0 (API 21) NDK - -#if !defined(SYS_epoll_create1) -#define SYS_epoll_create1 __NR_epoll_create1 -#endif - -#if !defined(SYS_gettid) -#define SYS_gettid __NR_gettid -#endif - -#if !defined(SYS_timer_create) -#define SYS_timer_create __NR_timer_create -#endif - -#if !defined(SYS_timer_getoverrun) -#define SYS_timer_getoverrun __NR_timer_getoverrun -#endif - -#if !defined(SYS_timer_settime) -#define SYS_timer_settime __NR_timer_settime -#endif - -#endif // CRASHPAD_COMPAT_ANDROID_SYS_SYSCALL_H_ diff --git a/Tools/Crashpad/include/compat/android/sys/user.h b/Tools/Crashpad/include/compat/android/sys/user.h deleted file mode 100644 index 4352a20677..0000000000 --- a/Tools/Crashpad/include/compat/android/sys/user.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_ANDROID_SYS_USER_H_ -#define CRASHPAD_COMPAT_ANDROID_SYS_USER_H_ - -// This is needed for traditional headers. -#include - -#include_next - -#endif // CRASHPAD_COMPAT_ANDROID_SYS_USER_H_ diff --git a/Tools/Crashpad/include/compat/linux/signal.h b/Tools/Crashpad/include/compat/linux/signal.h deleted file mode 100644 index 62b9c08636..0000000000 --- a/Tools/Crashpad/include/compat/linux/signal.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_LINUX_SIGNAL_H_ -#define CRASHPAD_COMPAT_LINUX_SIGNAL_H_ - -#include_next - -// Missing from glibc and bionic-x86_64 -#if defined(__x86_64__) || defined(__i386__) -#if !defined(X86_FXSR_MAGIC) -#define X86_FXSR_MAGIC 0x0000 -#endif -#endif // __x86_64__ || __i386__ - -#endif // CRASHPAD_COMPAT_LINUX_SIGNAL_H_ diff --git a/Tools/Crashpad/include/compat/linux/sys/ptrace.h b/Tools/Crashpad/include/compat/linux/sys/ptrace.h deleted file mode 100644 index e68125b5b1..0000000000 --- a/Tools/Crashpad/include/compat/linux/sys/ptrace.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_ -#define CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_ - -#include_next - -#include - -// https://sourceware.org/bugzilla/show_bug.cgi?id=22433 -#if !defined(PTRACE_GET_THREAD_AREA) && \ - defined(__GLIBC__) && (defined(__i386__) || defined(__x86_64__)) -static constexpr __ptrace_request PTRACE_GET_THREAD_AREA = - static_cast<__ptrace_request>(25); -#define PTRACE_GET_THREAD_AREA PTRACE_GET_THREAD_AREA -#endif // !PTRACE_GET_THREAD_AREA && __GLIBC__ && (__i386__ || __x86_64__) - -#endif // CRASHPAD_COMPAT_LINUX_SYS_PTRACE_H_ diff --git a/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h b/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h deleted file mode 100644 index f105f944e3..0000000000 --- a/Tools/Crashpad/include/compat/mac/AvailabilityMacros.h +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_ -#define CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_ - -#include_next - -// 10.7 SDK - -#ifndef MAC_OS_X_VERSION_10_7 -#define MAC_OS_X_VERSION_10_7 1070 -#endif - -// 10.8 SDK - -#ifndef MAC_OS_X_VERSION_10_8 -#define MAC_OS_X_VERSION_10_8 1080 -#endif - -// 10.9 SDK - -#ifndef MAC_OS_X_VERSION_10_9 -#define MAC_OS_X_VERSION_10_9 1090 -#endif - -// 10.10 SDK - -#ifndef MAC_OS_X_VERSION_10_10 -#define MAC_OS_X_VERSION_10_10 101000 -#endif - -// 10.11 SDK - -#ifndef MAC_OS_X_VERSION_10_11 -#define MAC_OS_X_VERSION_10_11 101100 -#endif - -// 10.12 SDK - -#ifndef MAC_OS_X_VERSION_10_12 -#define MAC_OS_X_VERSION_10_12 101200 -#endif - -// 10.13 SDK - -#ifndef MAC_OS_X_VERSION_10_13 -#define MAC_OS_X_VERSION_10_13 101300 -#endif - -#endif // CRASHPAD_COMPAT_MAC_AVAILABILITYMACROS_H_ diff --git a/Tools/Crashpad/include/compat/mac/kern/exc_resource.h b/Tools/Crashpad/include/compat/mac/kern/exc_resource.h deleted file mode 100644 index ca8943d37d..0000000000 --- a/Tools/Crashpad/include/compat/mac/kern/exc_resource.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_ -#define CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_ - -#if __has_include_next() -#include_next -#endif - -// 10.9 SDK - -#ifndef EXC_RESOURCE_DECODE_RESOURCE_TYPE -#define EXC_RESOURCE_DECODE_RESOURCE_TYPE(code) (((code) >> 61) & 0x7ull) -#endif - -#ifndef EXC_RESOURCE_DECODE_FLAVOR -#define EXC_RESOURCE_DECODE_FLAVOR(code) (((code) >> 58) & 0x7ull) -#endif - -#ifndef RESOURCE_TYPE_CPU -#define RESOURCE_TYPE_CPU 1 -#endif - -#ifndef RESOURCE_TYPE_WAKEUPS -#define RESOURCE_TYPE_WAKEUPS 2 -#endif - -#ifndef RESOURCE_TYPE_MEMORY -#define RESOURCE_TYPE_MEMORY 3 -#endif - -#ifndef FLAVOR_CPU_MONITOR -#define FLAVOR_CPU_MONITOR 1 -#endif - -#ifndef FLAVOR_WAKEUPS_MONITOR -#define FLAVOR_WAKEUPS_MONITOR 1 -#endif - -#ifndef FLAVOR_HIGH_WATERMARK -#define FLAVOR_HIGH_WATERMARK 1 -#endif - -// 10.10 SDK - -#ifndef FLAVOR_CPU_MONITOR_FATAL -#define FLAVOR_CPU_MONITOR_FATAL 2 -#endif - -// 10.12 SDK - -#ifndef RESOURCE_TYPE_IO -#define RESOURCE_TYPE_IO 4 -#endif - -#ifndef FLAVOR_IO_PHYSICAL_WRITES -#define FLAVOR_IO_PHYSICAL_WRITES 1 -#endif - -#ifndef FLAVOR_IO_LOGICAL_WRITES -#define FLAVOR_IO_LOGICAL_WRITES 2 -#endif - -#endif // CRASHPAD_COMPAT_MAC_KERN_EXC_RESOURCE_H_ diff --git a/Tools/Crashpad/include/compat/mac/mach-o/loader.h b/Tools/Crashpad/include/compat/mac/mach-o/loader.h deleted file mode 100644 index 95a735747f..0000000000 --- a/Tools/Crashpad/include/compat/mac/mach-o/loader.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_ -#define CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_ - -#include_next - -// 10.7 SDK - -#ifndef S_THREAD_LOCAL_ZEROFILL -#define S_THREAD_LOCAL_ZEROFILL 0x12 -#endif - -// 10.8 SDK - -#ifndef LC_SOURCE_VERSION -#define LC_SOURCE_VERSION 0x2a -#endif - -#endif // CRASHPAD_COMPAT_MAC_MACH_O_LOADER_H_ diff --git a/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h b/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h deleted file mode 100644 index de744d64de..0000000000 --- a/Tools/Crashpad/include/compat/mac/mach/i386/thread_state.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_ -#define CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_ - -#include_next - -// 10.13 SDK -// -// This was defined as 244 in the 10.7 through 10.12 SDKs, and 144 previously. -#if I386_THREAD_STATE_MAX < 614 -#undef I386_THREAD_STATE_MAX -#define I386_THREAD_STATE_MAX (614) -#endif - -#endif // CRASHPAD_COMPAT_MAC_MACH_I386_THREAD_STATE_H_ diff --git a/Tools/Crashpad/include/compat/mac/mach/mach.h b/Tools/Crashpad/include/compat/mac/mach/mach.h deleted file mode 100644 index 55f5fdd2e2..0000000000 --- a/Tools/Crashpad/include/compat/mac/mach/mach.h +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_MACH_MACH_H_ -#define CRASHPAD_COMPAT_MAC_MACH_MACH_H_ - -#include_next - -// - -// 10.8 SDK - -#ifndef EXC_RESOURCE -#define EXC_RESOURCE 11 -#endif - -#ifndef EXC_MASK_RESOURCE -#define EXC_MASK_RESOURCE (1 << EXC_RESOURCE) -#endif - -// 10.9 SDK - -#ifndef EXC_GUARD -#define EXC_GUARD 12 -#endif - -#ifndef EXC_MASK_GUARD -#define EXC_MASK_GUARD (1 << EXC_GUARD) -#endif - -// 10.11 SDK - -#ifndef EXC_CORPSE_NOTIFY -#define EXC_CORPSE_NOTIFY 13 -#endif - -#ifndef EXC_MASK_CORPSE_NOTIFY -#define EXC_MASK_CORPSE_NOTIFY (1 << EXC_CORPSE_NOTIFY) -#endif - -// Don’t expose EXC_MASK_ALL at all, because its definition varies with SDK, and -// older kernels will reject values that they don’t understand. Instead, use -// crashpad::ExcMaskAll(), which computes the correct value of EXC_MASK_ALL for -// the running system. -#undef EXC_MASK_ALL - -#if defined(__i386__) || defined(__x86_64__) - -// - -// 10.11 SDK - -#if EXC_TYPES_COUNT > 14 // Definition varies with SDK -#error Update this file for new exception types -#elif EXC_TYPES_COUNT != 14 -#undef EXC_TYPES_COUNT -#define EXC_TYPES_COUNT 14 -#endif - -// - -// 10.6 SDK -// -// Earlier versions of this SDK didn’t have AVX definitions. They didn’t appear -// until the version of the 10.6 SDK that shipped with Xcode 4.2, although -// versions of this SDK appeared with Xcode releases as early as Xcode 3.2. -// Similarly, the kernel didn’t handle AVX state until Mac OS X 10.6.8 -// (xnu-1504.15.3) and presumably the hardware-specific versions of Mac OS X -// 10.6.7 intended to run on processors with AVX. - -#ifndef x86_AVX_STATE32 -#define x86_AVX_STATE32 16 -#endif - -#ifndef x86_AVX_STATE64 -#define x86_AVX_STATE64 17 -#endif - -// 10.8 SDK - -#ifndef x86_AVX_STATE -#define x86_AVX_STATE 18 -#endif - -// 10.13 SDK - -#ifndef x86_AVX512_STATE32 -#define x86_AVX512_STATE32 19 -#endif - -#ifndef x86_AVX512_STATE64 -#define x86_AVX512_STATE64 20 -#endif - -#ifndef x86_AVX512_STATE -#define x86_AVX512_STATE 21 -#endif - -#endif // defined(__i386__) || defined(__x86_64__) - -// - -// 10.8 SDK - -#ifndef THREAD_STATE_FLAVOR_LIST_10_9 -#define THREAD_STATE_FLAVOR_LIST_10_9 129 -#endif - -#endif // CRASHPAD_COMPAT_MAC_MACH_MACH_H_ diff --git a/Tools/Crashpad/include/compat/mac/sys/resource.h b/Tools/Crashpad/include/compat/mac/sys/resource.h deleted file mode 100644 index 0697e169b5..0000000000 --- a/Tools/Crashpad/include/compat/mac/sys/resource.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_ -#define CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_ - -#include_next - -// 10.9 SDK - -#ifndef WAKEMON_MAKE_FATAL -#define WAKEMON_MAKE_FATAL 0x10 -#endif - -#endif // CRASHPAD_COMPAT_MAC_SYS_RESOURCE_H_ diff --git a/Tools/Crashpad/include/compat/non_mac/mach/mach.h b/Tools/Crashpad/include/compat/non_mac/mach/mach.h deleted file mode 100644 index f33bb10f38..0000000000 --- a/Tools/Crashpad/include/compat/non_mac/mach/mach.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_ -#define CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_ - -//! \file - -// - -//! \anchor EXC_x -//! \name EXC_* -//! -//! \brief Mach exception type definitions. -//! \{ -#define EXC_BAD_ACCESS 1 -#define EXC_BAD_INSTRUCTION 2 -#define EXC_ARITHMETIC 3 -#define EXC_EMULATION 4 -#define EXC_SOFTWARE 5 -#define EXC_BREAKPOINT 6 -#define EXC_SYSCALL 7 -#define EXC_MACH_SYSCALL 8 -#define EXC_RPC_ALERT 9 -#define EXC_CRASH 10 -#define EXC_RESOURCE 11 -#define EXC_GUARD 12 -#define EXC_CORPSE_NOTIFY 13 - -#define EXC_TYPES_COUNT 14 -//! \} - -#endif // CRASHPAD_COMPAT_NON_MAC_MACH_MACH_H_ diff --git a/Tools/Crashpad/include/compat/non_win/dbghelp.h b/Tools/Crashpad/include/compat/non_win/dbghelp.h deleted file mode 100644 index 5ce88b886b..0000000000 --- a/Tools/Crashpad/include/compat/non_win/dbghelp.h +++ /dev/null @@ -1,1106 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_ -#define CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_ - -#include - -#include "base/strings/string16.h" -#include "compat/non_win/timezoneapi.h" -#include "compat/non_win/verrsrc.h" -#include "compat/non_win/winnt.h" - -//! \file - -//! \brief The magic number for a minidump file, stored in -//! MINIDUMP_HEADER::Signature. -//! -//! A hex dump of a little-endian minidump file will begin with the string -//! “MDMP”. -#define MINIDUMP_SIGNATURE ('PMDM') // 0x4d444d50 - -//! \brief The version of a minidump file, stored in MINIDUMP_HEADER::Version. -#define MINIDUMP_VERSION (42899) - -//! \brief An offset within a minidump file, relative to the start of its -//! MINIDUMP_HEADER. -//! -//! RVA stands for “relative virtual address”. Within a minidump file, RVAs are -//! used as pointers to link structures together. -//! -//! \sa MINIDUMP_LOCATION_DESCRIPTOR -typedef uint32_t RVA; - -//! \brief A pointer to a structure or union within a minidump file. -struct __attribute__((packed, aligned(4))) MINIDUMP_LOCATION_DESCRIPTOR { - //! \brief The size of the referenced structure or union, in bytes. - uint32_t DataSize; - - //! \brief The relative virtual address of the structure or union within the - //! minidump file. - RVA Rva; -}; - -//! \brief A pointer to a snapshot of a region of memory contained within a -//! minidump file. -//! -//! \sa MINIDUMP_MEMORY_LIST -struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_DESCRIPTOR { - //! \brief The base address of the memory region in the address space of the - //! process that the minidump file contains a snapshot of. - uint64_t StartOfMemoryRange; - - //! \brief The contents of the memory region. - MINIDUMP_LOCATION_DESCRIPTOR Memory; -}; - -//! \brief The top-level structure identifying a minidump file. -//! -//! This structure contains a pointer to the stream directory, a second-level -//! structure which in turn contains pointers to third-level structures -//! (“streams”) containing the data within the minidump file. This structure -//! also contains the minidump file’s magic numbers, and other bookkeeping data. -//! -//! This structure must be present at the beginning of a minidump file (at ::RVA -//! 0). -struct __attribute__((packed, aligned(4))) MINIDUMP_HEADER { - //! \brief The minidump file format magic number, ::MINIDUMP_SIGNATURE. - uint32_t Signature; - - //! \brief The minidump file format version number, ::MINIDUMP_VERSION. - uint32_t Version; - - //! \brief The number of MINIDUMP_DIRECTORY elements present in the directory - //! referenced by #StreamDirectoryRva. - uint32_t NumberOfStreams; - - //! \brief A pointer to an array of MINIDUMP_DIRECTORY structures that - //! identify all of the streams within this minidump file. The array has - //! #NumberOfStreams elements present. - RVA StreamDirectoryRva; - - //! \brief The minidump file’s checksum. This can be `0`, and in practice, `0` - //! is the only value that has ever been seen in this field. - uint32_t CheckSum; - - //! \brief The time that the minidump file was generated, in `time_t` format, - //! the number of seconds since the POSIX epoch. - uint32_t TimeDateStamp; - - //! \brief A bitfield containing members of ::MINIDUMP_TYPE, describing the - //! types of data carried within this minidump file. - uint64_t Flags; -}; - -//! \brief A pointer to a stream within a minidump file. -//! -//! Each stream present in a minidump file will have a corresponding -//! MINIDUMP_DIRECTORY entry in the stream directory referenced by -//! MINIDUMP_HEADER::StreamDirectoryRva. -struct __attribute__((packed, aligned(4))) MINIDUMP_DIRECTORY { - //! \brief The type of stream referenced, a value of ::MINIDUMP_STREAM_TYPE. - uint32_t StreamType; - - //! \brief A pointer to the stream data within the minidump file. - MINIDUMP_LOCATION_DESCRIPTOR Location; -}; - -//! \brief A variable-length UTF-16-encoded string carried within a minidump -//! file. -//! -//! The UTF-16 string is stored as UTF-16LE or UTF-16BE according to the byte -//! ordering of the minidump file itself. -//! -//! \sa crashpad::MinidumpUTF8String -struct __attribute__((packed, aligned(4))) MINIDUMP_STRING { - //! \brief The length of the #Buffer field in bytes, not including the `NUL` - //! terminator. - //! - //! \note This field is interpreted as a byte count, not a count of UTF-16 - //! code units or Unicode code points. - uint32_t Length; - - //! \brief The string, encoded in UTF-16, and terminated with a UTF-16 `NUL` - //! code unit (two `NUL` bytes). - base::char16 Buffer[0]; -}; - -//! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each -//! stream structure has a corresponding stream type value to identify it. -//! -//! \sa crashpad::MinidumpStreamType -enum MINIDUMP_STREAM_TYPE { - //! \brief The stream type for MINIDUMP_THREAD_LIST. - ThreadListStream = 3, - - //! \brief The stream type for MINIDUMP_MODULE_LIST. - ModuleListStream = 4, - - //! \brief The stream type for MINIDUMP_MEMORY_LIST. - MemoryListStream = 5, - - //! \brief The stream type for MINIDUMP_EXCEPTION_STREAM. - ExceptionStream = 6, - - //! \brief The stream type for MINIDUMP_SYSTEM_INFO. - SystemInfoStream = 7, - - //! \brief The stream contains information about active `HANDLE`s. - HandleDataStream = 12, - - //! \brief The stream type for MINIDUMP_UNLOADED_MODULE_LIST. - UnloadedModuleListStream = 14, - - //! \brief The stream type for MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, - //! MINIDUMP_MISC_INFO_3, MINIDUMP_MISC_INFO_4, and MINIDUMP_MISC_INFO_5. - //! - //! More recent versions of this stream are supersets of earlier versions. - //! - //! The exact version of the stream that is present is implied by the stream’s - //! size. Furthermore, this stream contains a field, - //! MINIDUMP_MISC_INFO::Flags1, that indicates which data is present and - //! valid. - MiscInfoStream = 15, - - //! \brief The stream type for MINIDUMP_MEMORY_INFO_LIST. - MemoryInfoListStream = 16, - - //! \brief Values greater than this value will not be used by the system - //! and can be used for custom user data streams. - LastReservedStream = 0xffff, -}; - -//! \brief Information about the CPU (or CPUs) that ran the process that the -//! minidump file contains a snapshot of. -//! -//! This union only appears as MINIDUMP_SYSTEM_INFO::Cpu. Its interpretation is -//! controlled by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. -union __attribute__((packed, aligned(4))) CPU_INFORMATION { - //! \brief Information about 32-bit x86 CPUs, or x86_64 CPUs when running - //! 32-bit x86 processes. - struct __attribute__((packed, aligned(4))) { - //! \brief The CPU’s vendor identification string as encoded in `cpuid 0` - //! `ebx`, `edx`, and `ecx`, represented as it appears in these - //! registers. - //! - //! For Intel CPUs, `[0]` will encode “Genu”, `[1]` will encode “ineI”, and - //! `[2]` will encode “ntel”, for a vendor ID string “GenuineIntel”. - //! - //! \note The Windows documentation incorrectly states that these fields are - //! to be interpreted as `cpuid 0` `eax`, `ebx`, and `ecx`. - uint32_t VendorId[3]; - - //! \brief Family, model, and stepping ID values as encoded in `cpuid 1` - //! `eax`. - uint32_t VersionInformation; - - //! \brief A bitfield containing supported CPU capabilities as encoded in - //! `cpuid 1` `edx`. - uint32_t FeatureInformation; - - //! \brief A bitfield containing supported CPU capabalities as encoded in - //! `cpuid 0x80000001` `edx`. - //! - //! This field is only valid if #VendorId identifies the CPU vendor as - //! “AuthenticAMD”. - uint32_t AMDExtendedCpuFeatures; - } X86CpuInfo; - - //! \brief Information about non-x86 CPUs, and x86_64 CPUs when not running - //! 32-bit x86 processes. - struct __attribute__((packed, aligned(4))) { - //! \brief Bitfields containing supported CPU capabilities as identified by - //! bits corresponding to \ref PF_x "PF_*" values passed to - //! `IsProcessorFeaturePresent()`. - uint64_t ProcessorFeatures[2]; - } OtherCpuInfo; -}; - -//! \brief Information about the system that hosted the process that the -//! minidump file contains a snapshot of. -struct __attribute__((packed, aligned(4))) MINIDUMP_SYSTEM_INFO { - // The next 4 fields are from the SYSTEM_INFO structure returned by - // GetSystemInfo(). - - //! \brief The system’s CPU architecture. This may be a \ref - //! PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*" value, or a member - //! of crashpad::MinidumpCPUArchitecture. - //! - //! In some cases, a system may be able to run processes of multiple specific - //! architecture types. For example, systems based on 64-bit architectures - //! such as x86_64 are often able to run 32-bit code of another architecture - //! in the same family, such as 32-bit x86. On these systems, this field will - //! identify the architecture of the process that the minidump file contains a - //! snapshot of. - uint16_t ProcessorArchitecture; - - //! \brief General CPU version information. - //! - //! The precise interpretation of this field is specific to each CPU - //! architecture. For x86-family CPUs (including x86_64 and 32-bit x86), this - //! field contains the CPU family ID value from `cpuid 1` `eax`, adjusted to - //! take the extended family ID into account. - uint16_t ProcessorLevel; - - //! \brief Specific CPU version information. - //! - //! The precise interpretation of this field is specific to each CPU - //! architecture. For x86-family CPUs (including x86_64 and 32-bit x86), this - //! field contains values obtained from `cpuid 1` `eax`: the high byte - //! contains the CPU model ID value adjusted to take the extended model ID - //! into account, and the low byte contains the CPU stepping ID value. - uint16_t ProcessorRevision; - - //! \brief The total number of CPUs present in the system. - uint8_t NumberOfProcessors; - - // The next 7 fields are from the OSVERSIONINFOEX structure returned by - // GetVersionEx(). - - //! \brief The system’s operating system type, which distinguishes between - //! “desktop” or “workstation” systems and “server” systems. This may be a - //! \ref VER_NT_x "VER_NT_*" value, or a member of - //! crashpad::MinidumpOSType. - uint8_t ProductType; - - //! \brief The system’s operating system version number’s first (major) - //! component. - //! - //! - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `6`. - //! - For macOS 10.12.1, this would be `10`. - uint32_t MajorVersion; - - //! \brief The system’s operating system version number’s second (minor) - //! component. - //! - //! - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `1`. - //! - For macOS 10.12.1, this would be `12`. - uint32_t MinorVersion; - - //! \brief The system’s operating system version number’s third (build or - //! patch) component. - //! - //! - For Windows 7 (NT 6.1) SP1, version 6.1.7601, this would be `7601`. - //! - For macOS 10.12.1, this would be `1`. - uint32_t BuildNumber; - - //! \brief The system’s operating system family. This may be a \ref - //! VER_PLATFORM_x "VER_PLATFORM_*" value, or a member of - //! crashpad::MinidumpOS. - uint32_t PlatformId; - - //! \brief ::RVA of a MINIDUMP_STRING containing operating system-specific - //! version information. - //! - //! This field further identifies an operating system version beyond its - //! version number fields. Historically, “CSD” stands for “corrective service - //! diskette.” - //! - //! - On Windows, this is the name of the installed operating system service - //! pack, such as “Service Pack 1”. If no service pack is installed, this - //! field references an empty string. - //! - On macOS, this is the operating system build number from `sw_vers - //! -buildVersion`. For macOS 10.12.1 on most hardware types, this would - //! be `16B2657`. - //! - On Linux and other Unix-like systems, this is the kernel version from - //! `uname -srvm`, possibly with additional information appended. On - //! Android, the `ro.build.fingerprint` system property is appended. - RVA CSDVersionRva; - - //! \brief A bitfield identifying products installed on the system. This is - //! composed of \ref VER_SUITE_x "VER_SUITE_*" values. - //! - //! This field is Windows-specific, and has no meaning on other operating - //! systems. - uint16_t SuiteMask; - - uint16_t Reserved2; - - //! \brief Information about the system’s CPUs. - //! - //! This field is a union. Which of its members should be expressed is - //! controlled by the #ProcessorArchitecture field. If it is set to - //! crashpad::kMinidumpCPUArchitectureX86, the CPU_INFORMATION::X86CpuInfo - //! field is expressed. Otherwise, the CPU_INFORMATION::OtherCpuInfo field is - //! expressed. - //! - //! \note Older Breakpad implementations produce minidump files that express - //! CPU_INFORMATION::X86CpuInfo when #ProcessorArchitecture is set to - //! crashpad::kMinidumpCPUArchitectureAMD64. Minidump files produced by - //! `dbghelp.dll` on Windows express CPU_INFORMATION::OtherCpuInfo in this - //! case. - CPU_INFORMATION Cpu; -}; - -//! \brief Information about a specific thread within the process. -//! -//! \sa MINIDUMP_THREAD_LIST -struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD { - //! \brief The thread’s ID. This may be referenced by - //! MINIDUMP_EXCEPTION_STREAM::ThreadId. - uint32_t ThreadId; - - //! \brief The thread’s suspend count. - //! - //! This field will be `0` if the thread is schedulable (not suspended). - uint32_t SuspendCount; - - //! \brief The thread’s priority class. - //! - //! On Windows, this is a `*_PRIORITY_CLASS` value. `NORMAL_PRIORITY_CLASS` - //! has value `0x20`; higher priority classes have higher values. - uint32_t PriorityClass; - - //! \brief The thread’s priority level. - //! - //! On Windows, this is a `THREAD_PRIORITY_*` value. `THREAD_PRIORITY_NORMAL` - //! has value `0`; higher priorities have higher values, and lower priorities - //! have lower (negative) values. - uint32_t Priority; - - //! \brief The address of the thread’s thread environment block in the address - //! space of the process that the minidump file contains a snapshot of. - //! - //! The thread environment block contains thread-local data. - //! - //! A MINIDUMP_MEMORY_DESCRIPTOR may be present in the MINIDUMP_MEMORY_LIST - //! stream containing the thread-local data pointed to by this field. - uint64_t Teb; - - //! \brief A snapshot of the thread’s stack. - //! - //! A MINIDUMP_MEMORY_DESCRIPTOR may be present in the MINIDUMP_MEMORY_LIST - //! stream containing a pointer to the same memory range referenced by this - //! field. - MINIDUMP_MEMORY_DESCRIPTOR Stack; - - //! \brief A pointer to a CPU-specific CONTEXT structure containing the - //! thread’s context at the time the snapshot was taken. - //! - //! If the minidump file was generated as a result of an exception taken on - //! this thread, this field may identify a different context than the - //! exception context. For these minidump files, a MINIDUMP_EXCEPTION_STREAM - //! stream will be present, and the context contained within that stream will - //! be the exception context. - //! - //! The interpretation of the context structure is dependent on the CPU - //! architecture identified by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. - //! For crashpad::kMinidumpCPUArchitectureX86, this will be - //! crashpad::MinidumpContextX86. For crashpad::kMinidumpCPUArchitectureAMD64, - //! this will be crashpad::MinidumpContextAMD64. - MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; -}; - -//! \brief Information about all threads within the process. -struct __attribute__((packed, aligned(4))) MINIDUMP_THREAD_LIST { - //! \brief The number of threads present in the #Threads array. - uint32_t NumberOfThreads; - - //! \brief Structures identifying each thread within the process. - MINIDUMP_THREAD Threads[0]; -}; - -//! \brief Information about an exception that occurred in the process. -struct __attribute__((packed, aligned(4))) MINIDUMP_EXCEPTION { - //! \brief The top-level exception code identifying the exception, in - //! operating system-specific values. - //! - //! For macOS minidumps, this will be an \ref EXC_x "EXC_*" exception type, - //! such as `EXC_BAD_ACCESS`. `EXC_CRASH` will not appear here for exceptions - //! processed as `EXC_CRASH` when generated from another preceding exception: - //! the original exception code will appear instead. The exception type as it - //! was received will appear at index 0 of #ExceptionInformation. - //! - //! For Windows minidumps, this will be an `EXCEPTION_*` exception type, such - //! as `EXCEPTION_ACCESS_VIOLATION`. - //! - //! \note This field is named ExceptionCode, but what is known as the - //! “exception code” on macOS/Mach is actually stored in the - //! #ExceptionFlags field of a minidump file. - //! - //! \todo Document the possible values by OS. There may be OS-specific enums - //! in minidump_extensions.h. - uint32_t ExceptionCode; - - //! \brief Additional exception flags that further identify the exception, in - //! operating system-specific values. - //! - //! For macOS minidumps, this will be the value of the exception code at index - //! 0 as received by a Mach exception handler, except: - //! * For exception type `EXC_CRASH` generated from another preceding - //! exception, the original exception code will appear here, not the code - //! as received by the Mach exception handler. - //! * For exception types `EXC_RESOURCE` and `EXC_GUARD`, the high 32 bits of - //! the code received by the Mach exception handler will appear here. - //! - //! In all cases for macOS minidumps, the code as it was received by the Mach - //! exception handler will appear at index 1 of #ExceptionInformation. - //! - //! For Windows minidumps, this will either be `0` if the exception is - //! continuable, or `EXCEPTION_NONCONTINUABLE` to indicate a noncontinuable - //! exception. - //! - //! \todo Document the possible values by OS. There may be OS-specific enums - //! in minidump_extensions.h. - uint32_t ExceptionFlags; - - //! \brief An address, in the address space of the process that this minidump - //! file contains a snapshot of, of another MINIDUMP_EXCEPTION. This field - //! is used for nested exceptions. - uint64_t ExceptionRecord; - - //! \brief The address that caused the exception. - //! - //! This may be the address that caused a fault on data access, or it may be - //! the instruction pointer that contained an offending instruction. - uint64_t ExceptionAddress; - - //! \brief The number of valid elements in #ExceptionInformation. - uint32_t NumberParameters; - - uint32_t __unusedAlignment; - - //! \brief Additional information about the exception, specific to the - //! operating system and possibly the #ExceptionCode. - //! - //! For macOS minidumps, this will contain the exception type as received by a - //! Mach exception handler and the values of the `codes[0]` and `codes[1]` - //! (exception code and subcode) parameters supplied to the Mach exception - //! handler. Unlike #ExceptionCode and #ExceptionFlags, the values received by - //! a Mach exception handler are used directly here even for the `EXC_CRASH`, - //! `EXC_RESOURCE`, and `EXC_GUARD` exception types. - - //! For Windows, these are additional arguments (if any) as provided to - //! `RaiseException()`. - uint64_t ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; -}; - -//! \brief Information about the exception that triggered a minidump file’s -//! generation. -struct __attribute__((packed, aligned(4))) MINIDUMP_EXCEPTION_STREAM { - //! \brief The ID of the thread that caused the exception. - //! - //! \sa MINIDUMP_THREAD::ThreadId - uint32_t ThreadId; - - uint32_t __alignment; - - //! \brief Information about the exception. - MINIDUMP_EXCEPTION ExceptionRecord; - - //! \brief A pointer to a CPU-specific CONTEXT structure containing the - //! thread’s context at the time the exception was caused. - //! - //! The interpretation of the context structure is dependent on the CPU - //! architecture identified by MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. - //! For crashpad::kMinidumpCPUArchitectureX86, this will be - //! crashpad::MinidumpContextX86. For crashpad::kMinidumpCPUArchitectureAMD64, - //! this will be crashpad::MinidumpContextAMD64. - MINIDUMP_LOCATION_DESCRIPTOR ThreadContext; -}; - -//! \brief Information about a specific module loaded within the process at the -//! time the snapshot was taken. -//! -//! A module may be the main executable, a shared library, or a loadable module. -//! -//! \sa MINIDUMP_MODULE_LIST -struct __attribute__((packed, aligned(4))) MINIDUMP_MODULE { - //! \brief The base address of the loaded module in the address space of the - //! process that the minidump file contains a snapshot of. - uint64_t BaseOfImage; - - //! \brief The size of the loaded module. - uint32_t SizeOfImage; - - //! \brief The loaded module’s checksum, or `0` if unknown. - //! - //! On Windows, this field comes from the `CheckSum` field of the module’s - //! `IMAGE_OPTIONAL_HEADER` structure, if present. It reflects the checksum at - //! the time the module was linked. - uint32_t CheckSum; - - //! \brief The module’s timestamp, in `time_t` units, seconds since the POSIX - //! epoch, or `0` if unknown. - //! - //! On Windows, this field comes from the `TimeDateStamp` field of the - //! module’s `IMAGE_FILE_HEADER` structure. It reflects the timestamp at the - //! time the module was linked. - uint32_t TimeDateStamp; - - //! \brief ::RVA of a MINIDUMP_STRING containing the module’s path or file - //! name. - RVA ModuleNameRva; - - //! \brief The module’s version information. - VS_FIXEDFILEINFO VersionInfo; - - //! \brief A pointer to the module’s CodeView record, typically a link to its - //! debugging information in crashpad::CodeViewRecordPDB70 format. - //! - //! The specific format of the CodeView record is indicated by its signature, - //! the first 32-bit value in the structure. For links to debugging - //! information in contemporary usage, this is normally a - //! crashpad::CodeViewRecordPDB70 structure, but may be a - //! crashpad::CodeViewRecordPDB20 structure instead. These structures identify - //! a link to debugging data within a `.pdb` (Program Database) file. See Matching - //! Debug Information, PDB Files. - //! - //! On Windows, it is also possible for the CodeView record to contain - //! debugging information itself, as opposed to a link to a `.pdb` file. See - //! Microsoft - //! Symbol and Type Information, section 7.2, “Debug Information Format” - //! for a list of debug information formats, and Undocumented Windows 2000 - //! Secrets, Windows 2000 Debugging Support/Microsoft Symbol File - //! Internals/CodeView Subsections for an in-depth description of the CodeView - //! 4.1 format. Signatures seen in the wild include “NB09” (0x3930424e) for - //! CodeView 4.1 and “NB11” (0x3131424e) for CodeView 5.0. This form of - //! debugging information within the module, as opposed to a link to an - //! external `.pdb` file, is chosen by building with `/Z7` in Visual Studio - //! 6.0 (1998) and earlier. This embedded form of debugging information is now - //! considered obsolete. - //! - //! On Windows, the CodeView record is taken from a module’s - //! IMAGE_DEBUG_DIRECTORY entry whose Type field has the value - //! IMAGE_DEBUG_TYPE_CODEVIEW (`2`), if any. Records in - //! crashpad::CodeViewRecordPDB70 format are generated by Visual Studio .NET - //! (2002) (version 7.0) and later. - //! - //! When the CodeView record is not present, the fields of this - //! MINIDUMP_LOCATION_DESCRIPTOR will be `0`. - MINIDUMP_LOCATION_DESCRIPTOR CvRecord; - - //! \brief A pointer to the module’s miscellaneous debugging record, a - //! structure of type IMAGE_DEBUG_MISC. - //! - //! This field is Windows-specific, and has no meaning on other operating - //! systems. It is largely obsolete on Windows, where it was used to link to - //! debugging information stored in a `.dbg` file. `.dbg` files have been - //! superseded by `.pdb` files. - //! - //! On Windows, the miscellaneous debugging record is taken from module’s - //! IMAGE_DEBUG_DIRECTORY entry whose Type field has the value - //! IMAGE_DEBUG_TYPE_MISC (`4`), if any. - //! - //! When the miscellaneous debugging record is not present, the fields of this - //! MINIDUMP_LOCATION_DESCRIPTOR will be `0`. - //! - //! \sa #CvRecord - MINIDUMP_LOCATION_DESCRIPTOR MiscRecord; - - uint64_t Reserved0; - uint64_t Reserved1; -}; - -//! \brief Information about all modules loaded within the process at the time -//! the snapshot was taken. -struct __attribute__((packed, aligned(4))) MINIDUMP_MODULE_LIST { - //! \brief The number of modules present in the #Modules array. - uint32_t NumberOfModules; - - //! \brief Structures identifying each module present in the minidump file. - MINIDUMP_MODULE Modules[0]; -}; - -//! \brief Information about memory regions within the process. -//! -//! Typically, a minidump file will not contain a snapshot of a process’ entire -//! memory image. For minidump files identified as ::MiniDumpNormal in -//! MINIDUMP_HEADER::Flags, memory regions are limited to those referenced by -//! MINIDUMP_THREAD::Stack fields, and a small number of others possibly related -//! to the exception that triggered the snapshot to be taken. -struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_LIST { - //! \brief The number of memory regions present in the #MemoryRanges array. - uint32_t NumberOfMemoryRanges; - - //! \brief Structures identifying each memory region present in the minidump - //! file. - MINIDUMP_MEMORY_DESCRIPTOR MemoryRanges[0]; -}; - -//! \brief Contains the state of an individual system handle at the time the -//! snapshot was taken. This structure is Windows-specific. -//! -//! \sa MINIDUMP_HANDLE_DESCRIPTOR_2 -struct __attribute__((packed, aligned(4))) MINIDUMP_HANDLE_DESCRIPTOR { - //! \brief The Windows `HANDLE` value. - uint64_t Handle; - - //! \brief An RVA to a MINIDUMP_STRING structure that specifies the object - //! type of the handle. This member can be zero. - RVA TypeNameRva; - - //! \brief An RVA to a MINIDUMP_STRING structure that specifies the object - //! name of the handle. This member can be zero. - RVA ObjectNameRva; - - //! \brief The attributes for the handle, this corresponds to `OBJ_INHERIT`, - //! `OBJ_CASE_INSENSITIVE`, etc. - uint32_t Attributes; - - //! \brief The `ACCESS_MASK` for the handle. - uint32_t GrantedAccess; - - //! \brief This is the number of open handles to the object that this handle - //! refers to. - uint32_t HandleCount; - - //! \brief This is the number kernel references to the object that this - //! handle refers to. - uint32_t PointerCount; -}; - -//! \brief Contains the state of an individual system handle at the time the -//! snapshot was taken. This structure is Windows-specific. -//! -//! \sa MINIDUMP_HANDLE_DESCRIPTOR -struct __attribute__((packed, aligned(4))) MINIDUMP_HANDLE_DESCRIPTOR_2 - : public MINIDUMP_HANDLE_DESCRIPTOR { - //! \brief An RVA to a MINIDUMP_HANDLE_OBJECT_INFORMATION structure that - //! specifies object-specific information. This member can be zero if - //! there is no extra information. - RVA ObjectInfoRva; - - //! \brief Must be zero. - uint32_t Reserved0; -}; - -//! \brief Represents the header for a handle data stream. -//! -//! A list of MINIDUMP_HANDLE_DESCRIPTOR or MINIDUMP_HANDLE_DESCRIPTOR_2 -//! structures will immediately follow in the stream. -struct __attribute((packed, aligned(4))) MINIDUMP_HANDLE_DATA_STREAM { - //! \brief The size of the header information for the stream, in bytes. This - //! value is `sizeof(MINIDUMP_HANDLE_DATA_STREAM)`. - uint32_t SizeOfHeader; - - //! \brief The size of a descriptor in the stream, in bytes. This value is - //! `sizeof(MINIDUMP_HANDLE_DESCRIPTOR)` or - //! `sizeof(MINIDUMP_HANDLE_DESCRIPTOR_2)`. - uint32_t SizeOfDescriptor; - - //! \brief The number of descriptors in the stream. - uint32_t NumberOfDescriptors; - - //! \brief Must be zero. - uint32_t Reserved; -}; - -//! \brief Information about a specific module that was recorded as being -//! unloaded at the time the snapshot was taken. -//! -//! An unloaded module may be a shared library or a loadable module. -//! -//! \sa MINIDUMP_UNLOADED_MODULE_LIST -struct __attribute__((packed, aligned(4))) MINIDUMP_UNLOADED_MODULE { - //! \brief The base address where the module was loaded in the address space - //! of the process that the minidump file contains a snapshot of. - uint64_t BaseOfImage; - - //! \brief The size of the unloaded module. - uint32_t SizeOfImage; - - //! \brief The module’s checksum, or `0` if unknown. - //! - //! On Windows, this field comes from the `CheckSum` field of the module’s - //! `IMAGE_OPTIONAL_HEADER` structure, if present. It reflects the checksum at - //! the time the module was linked. - uint32_t CheckSum; - - //! \brief The module’s timestamp, in `time_t` units, seconds since the POSIX - //! epoch, or `0` if unknown. - //! - //! On Windows, this field comes from the `TimeDateStamp` field of the - //! module’s `IMAGE_FILE_HEADER` structure. It reflects the timestamp at the - //! time the module was linked. - uint32_t TimeDateStamp; - - //! \brief ::RVA of a MINIDUMP_STRING containing the module’s path or file - //! name. - RVA ModuleNameRva; -}; - -//! \brief Information about all modules recorded as unloaded when the snapshot -//! was taken. -//! -//! A list of MINIDUMP_UNLOADED_MODULE structures will immediately follow in the -//! stream. -struct __attribute__((packed, aligned(4))) MINIDUMP_UNLOADED_MODULE_LIST { - //! \brief The size of the header information for the stream, in bytes. This - //! value is `sizeof(MINIDUMP_UNLOADED_MODULE_LIST)`. - uint32_t SizeOfHeader; - - //! \brief The size of a descriptor in the stream, in bytes. This value is - //! `sizeof(MINIDUMP_UNLOADED_MODULE)`. - uint32_t SizeOfEntry; - - //! \brief The number of entries in the stream. - uint32_t NumberOfEntries; -}; - -//! \brief Information about XSAVE-managed state stored within CPU-specific -//! context structures. -struct __attribute__((packed, aligned(4))) XSTATE_CONFIG_FEATURE_MSC_INFO { - //! \brief The size of this structure, in bytes. This value is - //! `sizeof(XSTATE_CONFIG_FEATURE_MSC_INFO)`. - uint32_t SizeOfInfo; - - //! \brief The size of a CPU-specific context structure carrying all XSAVE - //! state components described by this structure. - //! - //! Equivalent to the value returned by `InitializeContext()` in \a - //! ContextLength. - uint32_t ContextSize; - - //! \brief The XSAVE state-component bitmap, XSAVE_BV. - //! - //! See Intel Software Developer’s Manual, Volume 1: Basic Architecture - //! (253665-060), 13.4.2 “XSAVE Header”. - uint64_t EnabledFeatures; - - //! \brief The location of each state component within a CPU-specific context - //! structure. - //! - //! This array is indexed by bit position numbers used in #EnabledFeatures. - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; -}; - -//! \anchor MINIDUMP_MISCx -//! \name MINIDUMP_MISC* -//! -//! \brief Field validity flag values for MINIDUMP_MISC_INFO::Flags1. -//! \{ - -//! \brief MINIDUMP_MISC_INFO::ProcessId is valid. -#define MINIDUMP_MISC1_PROCESS_ID 0x00000001 - -//! \brief The time-related fields in MINIDUMP_MISC_INFO are valid. -//! -//! The following fields are valid: -//! - MINIDUMP_MISC_INFO::ProcessCreateTime -//! - MINIDUMP_MISC_INFO::ProcessUserTime -//! - MINIDUMP_MISC_INFO::ProcessKernelTime -#define MINIDUMP_MISC1_PROCESS_TIMES 0x00000002 - -//! \brief The CPU-related fields in MINIDUMP_MISC_INFO_2 are valid. -//! -//! The following fields are valid: -//! - MINIDUMP_MISC_INFO_2::ProcessorMaxMhz -//! - MINIDUMP_MISC_INFO_2::ProcessorCurrentMhz -//! - MINIDUMP_MISC_INFO_2::ProcessorMhzLimit -//! - MINIDUMP_MISC_INFO_2::ProcessorMaxIdleState -//! - MINIDUMP_MISC_INFO_2::ProcessorCurrentIdleState -//! -//! \note This macro should likely have been named -//! MINIDUMP_MISC2_PROCESSOR_POWER_INFO. -#define MINIDUMP_MISC1_PROCESSOR_POWER_INFO 0x00000004 - -//! \brief MINIDUMP_MISC_INFO_3::ProcessIntegrityLevel is valid. -#define MINIDUMP_MISC3_PROCESS_INTEGRITY 0x00000010 - -//! \brief MINIDUMP_MISC_INFO_3::ProcessExecuteFlags is valid. -#define MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS 0x00000020 - -//! \brief The time zone-related fields in MINIDUMP_MISC_INFO_3 are valid. -//! -//! The following fields are valid: -//! - MINIDUMP_MISC_INFO_3::TimeZoneId -//! - MINIDUMP_MISC_INFO_3::TimeZone -#define MINIDUMP_MISC3_TIMEZONE 0x00000040 - -//! \brief MINIDUMP_MISC_INFO_3::ProtectedProcess is valid. -#define MINIDUMP_MISC3_PROTECTED_PROCESS 0x00000080 - -//! \brief The build string-related fields in MINIDUMP_MISC_INFO_4 are valid. -//! -//! The following fields are valid: -//! - MINIDUMP_MISC_INFO_4::BuildString -//! - MINIDUMP_MISC_INFO_4::DbgBldStr -#define MINIDUMP_MISC4_BUILDSTRING 0x00000100 - -//! \brief MINIDUMP_MISC_INFO_5::ProcessCookie is valid. -#define MINIDUMP_MISC5_PROCESS_COOKIE 0x00000200 - -//! \} - -//! \brief Information about the process that the minidump file contains a -//! snapshot of, as well as the system that hosted that process. -//! -//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*" -//! \sa MINIDUMP_MISC_INFO_2 -//! \sa MINIDUMP_MISC_INFO_3 -//! \sa MINIDUMP_MISC_INFO_4 -//! \sa MINIDUMP_MISC_INFO_5 -//! \sa MINIDUMP_MISC_INFO_N -struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO { - //! \brief The size of the structure. - //! - //! This field can be used to distinguish between different versions of this - //! structure: MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, - //! and MINIDUMP_MISC_INFO_4. - //! - //! \sa Flags1 - uint32_t SizeOfInfo; - - //! \brief A bit field of \ref MINIDUMP_MISCx "MINIDUMP_MISC*" values - //! indicating which fields of this structure contain valid data. - uint32_t Flags1; - - //! \brief The process ID of the process. - uint32_t ProcessId; - - //! \brief The time that the process started, in `time_t` units, seconds since - //! the POSIX epoch. - uint32_t ProcessCreateTime; - - //! \brief The amount of user-mode CPU time used by the process, in seconds, - //! at the time of the snapshot. - uint32_t ProcessUserTime; - - //! \brief The amount of system-mode (kernel) CPU time used by the process, in - //! seconds, at the time of the snapshot. - uint32_t ProcessKernelTime; -}; - -//! \brief Information about the process that the minidump file contains a -//! snapshot of, as well as the system that hosted that process. -//! -//! This structure variant is used on Windows Vista (NT 6.0) and later. -//! -//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*" -//! \sa MINIDUMP_MISC_INFO -//! \sa MINIDUMP_MISC_INFO_3 -//! \sa MINIDUMP_MISC_INFO_4 -//! \sa MINIDUMP_MISC_INFO_5 -//! \sa MINIDUMP_MISC_INFO_N -struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_2 - : public MINIDUMP_MISC_INFO { - //! \brief The maximum clock rate of the system’s CPU or CPUs, in MHz. - uint32_t ProcessorMaxMhz; - - //! \brief The clock rate of the system’s CPU or CPUs, in MHz, at the time of - //! the snapshot. - uint32_t ProcessorCurrentMhz; - - //! \brief The maximum clock rate of the system’s CPU or CPUs, in MHz, reduced - //! by any thermal limitations, at the time of the snapshot. - uint32_t ProcessorMhzLimit; - - //! \brief The maximum idle state of the system’s CPU or CPUs. - uint32_t ProcessorMaxIdleState; - - //! \brief The idle state of the system’s CPU or CPUs at the time of the - //! snapshot. - uint32_t ProcessorCurrentIdleState; -}; - -//! \brief Information about the process that the minidump file contains a -//! snapshot of, as well as the system that hosted that process. -//! -//! This structure variant is used on Windows 7 (NT 6.1) and later. -//! -//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*" -//! \sa MINIDUMP_MISC_INFO -//! \sa MINIDUMP_MISC_INFO_2 -//! \sa MINIDUMP_MISC_INFO_4 -//! \sa MINIDUMP_MISC_INFO_5 -//! \sa MINIDUMP_MISC_INFO_N -struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_3 - : public MINIDUMP_MISC_INFO_2 { - //! \brief The process’ integrity level. - //! - //! Windows typically uses `SECURITY_MANDATORY_MEDIUM_RID` (0x2000) for - //! processes belonging to normal authenticated users and - //! `SECURITY_MANDATORY_HIGH_RID` (0x3000) for elevated processes. - //! - //! This field is Windows-specific, and has no meaning on other operating - //! systems. - uint32_t ProcessIntegrityLevel; - - //! \brief The process’ execute flags. - //! - //! On Windows, this appears to be returned by `NtQueryInformationProcess()` - //! with an argument of `ProcessExecuteFlags` (34). - //! - //! This field is Windows-specific, and has no meaning on other operating - //! systems. - uint32_t ProcessExecuteFlags; - - //! \brief Whether the process is protected. - //! - //! This field is Windows-specific, and has no meaning on other operating - //! systems. - uint32_t ProtectedProcess; - - //! \brief Whether daylight saving time was being observed in the system’s - //! location at the time of the snapshot. - //! - //! This field can contain the following values: - //! - `0` if the location does not observe daylight saving time at all. The - //! TIME_ZONE_INFORMATION::StandardName field of #TimeZoneId contains the - //! time zone name. - //! - `1` if the location observes daylight saving time, but standard time - //! was in effect at the time of the snapshot. The - //! TIME_ZONE_INFORMATION::StandardName field of #TimeZoneId contains the - //! time zone name. - //! - `2` if the location observes daylight saving time, and it was in effect - //! at the time of the snapshot. The TIME_ZONE_INFORMATION::DaylightName - //! field of #TimeZoneId contains the time zone name. - //! - //! \sa #TimeZone - uint32_t TimeZoneId; - - //! \brief Information about the time zone at the system’s location. - //! - //! \sa #TimeZoneId - TIME_ZONE_INFORMATION TimeZone; -}; - -//! \brief Information about the process that the minidump file contains a -//! snapshot of, as well as the system that hosted that process. -//! -//! This structure variant is used on Windows 8 (NT 6.2) and later. -//! -//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*" -//! \sa MINIDUMP_MISC_INFO -//! \sa MINIDUMP_MISC_INFO_2 -//! \sa MINIDUMP_MISC_INFO_3 -//! \sa MINIDUMP_MISC_INFO_5 -//! \sa MINIDUMP_MISC_INFO_N -struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_4 - : public MINIDUMP_MISC_INFO_3 { - //! \brief The operating system’s “build string”, a string identifying a - //! specific build of the operating system. - //! - //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit. - //! - //! On Windows 8.1 (NT 6.3), this is “6.3.9600.17031 - //! (winblue_gdr.140221-1952)”. - base::char16 BuildString[260]; - - //! \brief The minidump producer’s “build string”, a string identifying the - //! module that produced a minidump file. - //! - //! This string is UTF-16-encoded and terminated by a UTF-16 `NUL` code unit. - //! - //! On Windows 8.1 (NT 6.3), this may be “dbghelp.i386,6.3.9600.16520” or - //! “dbghelp.amd64,6.3.9600.16520” depending on CPU architecture. - base::char16 DbgBldStr[40]; -}; - -//! \brief Information about the process that the minidump file contains a -//! snapshot of, as well as the system that hosted that process. -//! -//! This structure variant is used on Windows 10 and later. -//! -//! \sa \ref MINIDUMP_MISCx "MINIDUMP_MISC*" -//! \sa MINIDUMP_MISC_INFO -//! \sa MINIDUMP_MISC_INFO_2 -//! \sa MINIDUMP_MISC_INFO_3 -//! \sa MINIDUMP_MISC_INFO_4 -//! \sa MINIDUMP_MISC_INFO_N -struct __attribute__((packed, aligned(4))) MINIDUMP_MISC_INFO_5 - : public MINIDUMP_MISC_INFO_4 { - //! \brief Information about XSAVE-managed state stored within CPU-specific - //! context structures. - //! - //! This information can be used to locate state components within - //! CPU-specific context structures. - XSTATE_CONFIG_FEATURE_MSC_INFO XStateData; - - uint32_t ProcessCookie; -}; - -//! \brief The latest known version of the MINIDUMP_MISC_INFO structure. -typedef MINIDUMP_MISC_INFO_5 MINIDUMP_MISC_INFO_N; - -//! \brief Describes a region of memory. -struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO { - //! \brief The base address of the region of pages. - uint64_t BaseAddress; - - //! \brief The base address of a range of pages in this region. The page is - //! contained within this memory region. - uint64_t AllocationBase; - - //! \brief The memory protection when the region was initially allocated. This - //! member can be one of the memory protection options (such as - //! \ref PAGE_x "PAGE_EXECUTE", \ref PAGE_x "PAGE_NOACCESS", etc.), along - //! with \ref PAGE_x "PAGE_GUARD" or \ref PAGE_x "PAGE_NOCACHE", as - //! needed. - uint32_t AllocationProtect; - - uint32_t __alignment1; - - //! \brief The size of the region beginning at the base address in which all - //! pages have identical attributes, in bytes. - uint64_t RegionSize; - - //! \brief The state of the pages in the region. This can be one of - //! \ref MEM_x "MEM_COMMIT", \ref MEM_x "MEM_FREE", or \ref MEM_x - //! "MEM_RESERVE". - uint32_t State; - - //! \brief The access protection of the pages in the region. This member is - //! one of the values listed for the #AllocationProtect member. - uint32_t Protect; - - //! \brief The type of pages in the region. This can be one of \ref MEM_x - //! "MEM_IMAGE", \ref MEM_x "MEM_MAPPED", or \ref MEM_x "MEM_PRIVATE". - uint32_t Type; - - uint32_t __alignment2; -}; - -//! \brief Contains a list of memory regions. -struct __attribute__((packed, aligned(4))) MINIDUMP_MEMORY_INFO_LIST { - //! \brief The size of the header data for the stream, in bytes. This is - //! generally sizeof(MINIDUMP_MEMORY_INFO_LIST). - uint32_t SizeOfHeader; - - //! \brief The size of each entry following the header, in bytes. This is - //! generally sizeof(MINIDUMP_MEMORY_INFO). - uint32_t SizeOfEntry; - - //! \brief The number of entries in the stream. These are generally - //! MINIDUMP_MEMORY_INFO structures. The entries follow the header. - uint64_t NumberOfEntries; -}; - -//! \brief Minidump file type values for MINIDUMP_HEADER::Flags. These bits -//! describe the types of data carried within a minidump file. -enum MINIDUMP_TYPE { - //! \brief A minidump file without any additional data. - //! - //! This type of minidump file contains: - //! - A MINIDUMP_SYSTEM_INFO stream. - //! - A MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, or - //! MINIDUMP_MISC_INFO_4 stream, depending on which fields are present. - //! - A MINIDUMP_THREAD_LIST stream. All threads are present, along with a - //! snapshot of each thread’s stack memory sufficient to obtain backtraces. - //! - If the minidump file was generated as a result of an exception, a - //! MINIDUMP_EXCEPTION_STREAM describing the exception. - //! - A MINIDUMP_MODULE_LIST stream. All loaded modules are present. - //! - Typically, a MINIDUMP_MEMORY_LIST stream containing duplicate pointers - //! to the stack memory regions also referenced by the MINIDUMP_THREAD_LIST - //! stream. This type of minidump file also includes a - //! MINIDUMP_MEMORY_DESCRIPTOR containing the 256 bytes centered around - //! the exception address or the instruction pointer. - MiniDumpNormal = 0x00000000, -}; - -#endif // CRASHPAD_COMPAT_NON_WIN_DBGHELP_H_ diff --git a/Tools/Crashpad/include/compat/non_win/minwinbase.h b/Tools/Crashpad/include/compat/non_win/minwinbase.h deleted file mode 100644 index 2761b1cccd..0000000000 --- a/Tools/Crashpad/include/compat/non_win/minwinbase.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_ -#define CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_ - -#include - -//! \brief Represents a date and time. -struct SYSTEMTIME { - //! \brief The year, represented fully. - //! - //! The year 2014 would be represented in this field as `2014`. - uint16_t wYear; - - //! \brief The month of the year, `1` for January and `12` for December. - uint16_t wMonth; - - //! \brief The day of the week, `0` for Sunday and `6` for Saturday. - uint16_t wDayOfWeek; - - //! \brief The day of the month, `1` through `31`. - uint16_t wDay; - - //! \brief The hour of the day, `0` through `23`. - uint16_t wHour; - - //! \brief The minute of the hour, `0` through `59`. - uint16_t wMinute; - - //! \brief The second of the minute, `0` through `60`. - uint16_t wSecond; - - //! \brief The millisecond of the second, `0` through `999`. - uint16_t wMilliseconds; -}; - -#endif // CRASHPAD_COMPAT_NON_WIN_MINWINBASE_H_ diff --git a/Tools/Crashpad/include/compat/non_win/timezoneapi.h b/Tools/Crashpad/include/compat/non_win/timezoneapi.h deleted file mode 100644 index 59efae286d..0000000000 --- a/Tools/Crashpad/include/compat/non_win/timezoneapi.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_ -#define CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_ - -#include - -#include "base/strings/string16.h" -#include "compat/non_win/minwinbase.h" - -//! \brief Information about a time zone and its daylight saving rules. -struct TIME_ZONE_INFORMATION { - //! \brief The number of minutes west of UTC. - int32_t Bias; - - //! \brief The UTF-16-encoded name of the time zone when observing standard - //! time. - base::char16 StandardName[32]; - - //! \brief The date and time to switch from daylight saving time to standard - //! time. - //! - //! This can be a specific time, or with SYSTEMTIME::wYear set to `0`, it can - //! reflect an annual recurring transition. In that case, SYSTEMTIME::wDay in - //! the range `1` to `5` is interpreted as the given occurrence of - //! SYSTEMTIME::wDayOfWeek within the month, `1` being the first occurrence - //! and `5` being the last (even if there are fewer than 5). - SYSTEMTIME StandardDate; - - //! \brief The bias relative to #Bias to be applied when observing standard - //! time. - int32_t StandardBias; - - //! \brief The UTF-16-encoded name of the time zone when observing daylight - //! saving time. - base::char16 DaylightName[32]; - - //! \brief The date and time to switch from standard time to daylight saving - //! time. - //! - //! This field is specified in the same manner as #StandardDate. - SYSTEMTIME DaylightDate; - - //! \brief The bias relative to #Bias to be applied when observing daylight - //! saving time. - int32_t DaylightBias; -}; - -#endif // CRASHPAD_COMPAT_NON_WIN_TIMEZONEAPI_H_ diff --git a/Tools/Crashpad/include/compat/non_win/verrsrc.h b/Tools/Crashpad/include/compat/non_win/verrsrc.h deleted file mode 100644 index 70f5344240..0000000000 --- a/Tools/Crashpad/include/compat/non_win/verrsrc.h +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_ -#define CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_ - -#include - -//! \file - -//! \brief The magic number for a VS_FIXEDFILEINFO structure, stored in -//! VS_FIXEDFILEINFO::dwSignature. -#define VS_FFI_SIGNATURE 0xfeef04bd - -//! \brief The version of a VS_FIXEDFILEINFO structure, stored in -//! VS_FIXEDFILEINFO::dwStrucVersion. -#define VS_FFI_STRUCVERSION 0x00010000 - -//! \anchor VS_FF_x -//! \name VS_FF_* -//! -//! \brief File attribute values for VS_FIXEDFILEINFO::dwFileFlags and -//! VS_FIXEDFILEINFO::dwFileFlagsMask. -//! \{ -#define VS_FF_DEBUG 0x00000001 -#define VS_FF_PRERELEASE 0x00000002 -#define VS_FF_PATCHED 0x00000004 -#define VS_FF_PRIVATEBUILD 0x00000008 -#define VS_FF_INFOINFERRED 0x00000010 -#define VS_FF_SPECIALBUILD 0x00000020 -//! \} - -//! \anchor VOS_x -//! \name VOS_* -//! -//! \brief Operating system values for VS_FIXEDFILEINFO::dwFileOS. -//! \{ -#define VOS_UNKNOWN 0x00000000 -#define VOS_DOS 0x00010000 -#define VOS_OS216 0x00020000 -#define VOS_OS232 0x00030000 -#define VOS_NT 0x00040000 -#define VOS_WINCE 0x00050000 -#define VOS__BASE 0x00000000 -#define VOS__WINDOWS16 0x00000001 -#define VOS__PM16 0x00000002 -#define VOS__PM32 0x00000003 -#define VOS__WINDOWS32 0x00000004 -#define VOS_DOS_WINDOWS16 0x00010001 -#define VOS_DOS_WINDOWS32 0x00010004 -#define VOS_OS216_PM16 0x00020002 -#define VOS_OS232_PM32 0x00030003 -#define VOS_NT_WINDOWS32 0x00040004 -//! \} - -//! \anchor VFT_x -//! \name VFT_* -//! -//! \brief File type values for VS_FIXEDFILEINFO::dwFileType. -//! \{ -#define VFT_UNKNOWN 0x00000000 -#define VFT_APP 0x00000001 -#define VFT_DLL 0x00000002 -#define VFT_DRV 0x00000003 -#define VFT_FONT 0x00000004 -#define VFT_VXD 0x00000005 -#define VFT_STATIC_LIB 0x00000007 -//! \} - -//! \anchor VFT2_x -//! \name VFT2_* -//! -//! \brief File subtype values for VS_FIXEDFILEINFO::dwFileSubtype. -//! \{ -#define VFT2_UNKNOWN 0x00000000 -#define VFT2_DRV_PRINTER 0x00000001 -#define VFT2_DRV_KEYBOARD 0x00000002 -#define VFT2_DRV_LANGUAGE 0x00000003 -#define VFT2_DRV_DISPLAY 0x00000004 -#define VFT2_DRV_MOUSE 0x00000005 -#define VFT2_DRV_NETWORK 0x00000006 -#define VFT2_DRV_SYSTEM 0x00000007 -#define VFT2_DRV_INSTALLABLE 0x00000008 -#define VFT2_DRV_SOUND 0x00000009 -#define VFT2_DRV_COMM 0x0000000A -#define VFT2_DRV_INPUTMETHOD 0x0000000B -#define VFT2_DRV_VERSIONED_PRINTER 0x0000000C -#define VFT2_FONT_RASTER 0x00000001 -#define VFT2_FONT_VECTOR 0x00000002 -#define VFT2_FONT_TRUETYPE 0x00000003 -//! \} - -//! \brief Version information for a file. -//! -//! On Windows, this information is derived from a file’s version information -//! resource, and is obtained by calling `VerQueryValue()` with an `lpSubBlock` -//! argument of `"\"` (a single backslash). -struct VS_FIXEDFILEINFO { - //! \brief The structure’s magic number, ::VS_FFI_SIGNATURE. - uint32_t dwSignature; - - //! \brief The structure’s version, ::VS_FFI_STRUCVERSION. - uint32_t dwStrucVersion; - - //! \brief The more-significant portion of the file’s version number. - //! - //! This field contains the first two components of a four-component version - //! number. For a file whose version is 1.2.3.4, this field would be - //! `0x00010002`. - //! - //! \sa dwFileVersionLS - uint32_t dwFileVersionMS; - - //! \brief The less-significant portion of the file’s version number. - //! - //! This field contains the last two components of a four-component version - //! number. For a file whose version is 1.2.3.4, this field would be - //! `0x00030004`. - //! - //! \sa dwFileVersionMS - uint32_t dwFileVersionLS; - - //! \brief The more-significant portion of the product’s version number. - //! - //! This field contains the first two components of a four-component version - //! number. For a product whose version is 1.2.3.4, this field would be - //! `0x00010002`. - //! - //! \sa dwProductVersionLS - uint32_t dwProductVersionMS; - - //! \brief The less-significant portion of the product’s version number. - //! - //! This field contains the last two components of a four-component version - //! number. For a product whose version is 1.2.3.4, this field would be - //! `0x00030004`. - //! - //! \sa dwProductVersionMS - uint32_t dwProductVersionLS; - - //! \brief A bitmask of \ref VS_FF_x "VS_FF_*" values indicating which bits in - //! #dwFileFlags are valid. - uint32_t dwFileFlagsMask; - - //! \brief A bitmask of \ref VS_FF_x "VS_FF_*" values identifying attributes - //! of the file. Only bits present in #dwFileFlagsMask are valid. - uint32_t dwFileFlags; - - //! \brief The file’s intended operating system, a value of \ref VOS_x - //! "VOS_*". - uint32_t dwFileOS; - - //! \brief The file’s type, a value of \ref VFT_x "VFT_*". - uint32_t dwFileType; - - //! \brief The file’s subtype, a value of \ref VFT2_x "VFT2_*" corresponding - //! to its #dwFileType, if the file type has subtypes. - uint32_t dwFileSubtype; - - //! \brief The more-significant portion of the file’s creation date. - //! - //! The intended encoding of this field is unknown. This field is unused and - //! always has the value `0`. - uint32_t dwFileDateMS; - - //! \brief The less-significant portion of the file’s creation date. - //! - //! The intended encoding of this field is unknown. This field is unused and - //! always has the value `0`. - uint32_t dwFileDateLS; -}; - -#endif // CRASHPAD_COMPAT_NON_WIN_VERRSRC_H_ diff --git a/Tools/Crashpad/include/compat/non_win/windows.h b/Tools/Crashpad/include/compat/non_win/windows.h deleted file mode 100644 index 4577451493..0000000000 --- a/Tools/Crashpad/include/compat/non_win/windows.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// dbghelp.h on Windows requires inclusion of windows.h before it. To avoid -// cluttering all inclusions of dbghelp.h with #ifdefs, always include windows.h -// and have an empty one on non-Windows platforms. diff --git a/Tools/Crashpad/include/compat/non_win/winnt.h b/Tools/Crashpad/include/compat/non_win/winnt.h deleted file mode 100644 index f2ed6ace07..0000000000 --- a/Tools/Crashpad/include/compat/non_win/winnt.h +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_NON_WIN_WINNT_H_ -#define CRASHPAD_COMPAT_NON_WIN_WINNT_H_ - -#include - -//! \file - -//! \anchor VER_SUITE_x -//! \name VER_SUITE_* -//! -//! \brief Installable product values for MINIDUMP_SYSTEM_INFO::SuiteMask. -//! \{ -#define VER_SUITE_SMALLBUSINESS 0x0001 -#define VER_SUITE_ENTERPRISE 0x0002 -#define VER_SUITE_BACKOFFICE 0x0004 -#define VER_SUITE_COMMUNICATIONS 0x0008 -#define VER_SUITE_TERMINAL 0x0010 -#define VER_SUITE_SMALLBUSINESS_RESTRICTED 0x0020 -#define VER_SUITE_EMBEDDEDNT 0x0040 -#define VER_SUITE_DATACENTER 0x0080 -#define VER_SUITE_SINGLEUSERTS 0x0100 -#define VER_SUITE_PERSONAL 0x0200 -#define VER_SUITE_BLADE 0x0400 -#define VER_SUITE_EMBEDDED_RESTRICTED 0x0800 -#define VER_SUITE_SECURITY_APPLIANCE 0x1000 -#define VER_SUITE_STORAGE_SERVER 0x2000 -#define VER_SUITE_COMPUTE_SERVER 0x4000 -#define VER_SUITE_WH_SERVER 0x8000 -//! \} - -//! \brief The maximum number of exception parameters present in the -//! MINIDUMP_EXCEPTION::ExceptionInformation array. -#define EXCEPTION_MAXIMUM_PARAMETERS 15 - -//! \anchor PROCESSOR_ARCHITECTURE_x -//! \name PROCESSOR_ARCHITECTURE_* -//! -//! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. -//! -//! \sa crashpad::MinidumpCPUArchitecture -//! \{ -#define PROCESSOR_ARCHITECTURE_INTEL 0 -#define PROCESSOR_ARCHITECTURE_MIPS 1 -#define PROCESSOR_ARCHITECTURE_ALPHA 2 -#define PROCESSOR_ARCHITECTURE_PPC 3 -#define PROCESSOR_ARCHITECTURE_SHX 4 -#define PROCESSOR_ARCHITECTURE_ARM 5 -#define PROCESSOR_ARCHITECTURE_IA64 6 -#define PROCESSOR_ARCHITECTURE_ALPHA64 7 -#define PROCESSOR_ARCHITECTURE_MSIL 8 -#define PROCESSOR_ARCHITECTURE_AMD64 9 -#define PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 10 -#define PROCESSOR_ARCHITECTURE_NEUTRAL 11 -#define PROCESSOR_ARCHITECTURE_ARM64 12 -#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 -#define PROCESSOR_ARCHITECTURE_UNKNOWN 0xffff -//! \} - -//! \anchor PF_x -//! \name PF_* -//! -//! \brief CPU feature values for \ref CPU_INFORMATION::ProcessorFeatures -//! "CPU_INFORMATION::OtherCpuInfo::ProcessorFeatures". -//! -//! \{ -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_SSE_DAZ_MODE_AVAILABLE 11 -#define PF_NX_ENABLED 12 -#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 -#define PF_COMPARE_EXCHANGE128 14 -#define PF_COMPARE64_EXCHANGE128 15 -#define PF_CHANNELS_ENABLED 16 -#define PF_XSAVE_ENABLED 17 -#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 -#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 -#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 -#define PF_VIRT_FIRMWARE_ENABLED 21 -#define PF_RDWRFSGSBASE_AVAILABLE 22 -#define PF_FASTFAIL_AVAILABLE 23 -#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 -#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 -#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 -#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 -#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 -#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 -#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 -#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 -#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32 -//! \} - -//! \anchor PAGE_x -//! \name PAGE_* -//! -//! \brief Memory protection constants for MINIDUMP_MEMORY_INFO::Protect and -//! MINIDUMP_MEMORY_INFO::AllocationProtect. -//! \{ -#define PAGE_NOACCESS 0x1 -#define PAGE_READONLY 0x2 -#define PAGE_READWRITE 0x4 -#define PAGE_WRITECOPY 0x8 -#define PAGE_EXECUTE 0x10 -#define PAGE_EXECUTE_READ 0x20 -#define PAGE_EXECUTE_READWRITE 0x40 -#define PAGE_EXECUTE_WRITECOPY 0x80 -#define PAGE_GUARD 0x100 -#define PAGE_NOCACHE 0x200 -#define PAGE_WRITECOMBINE 0x400 -//! \} - -//! \anchor MEM_x -//! \name MEM_* -//! -//! \brief Memory state and type constants for MINIDUMP_MEMORY_INFO::State and -//! MINIDUMP_MEMORY_INFO::Type. -//! \{ -#define MEM_COMMIT 0x1000 -#define MEM_RESERVE 0x2000 -#define MEM_DECOMMIT 0x4000 -#define MEM_RELEASE 0x8000 -#define MEM_FREE 0x10000 -#define MEM_PRIVATE 0x20000 -#define MEM_MAPPED 0x40000 -#define MEM_RESET 0x80000 -//! \} - -//! \brief The maximum number of distinct identifiable features that could -//! possibly be carried in an XSAVE area. -//! -//! This corresponds to the number of bits in the XSAVE state-component bitmap, -//! XSAVE_BV. See Intel Software Developer’s Manual, Volume 1: Basic -//! Architecture (253665-060), 13.4.2 “XSAVE Header”. -#define MAXIMUM_XSTATE_FEATURES (64) - -//! \brief The location of a single state component within an XSAVE area. -struct XSTATE_FEATURE { - //! \brief The location of a state component within a CPU-specific context - //! structure. - //! - //! This is equivalent to the difference (`ptrdiff_t`) between the return - //! value of `LocateXStateFeature()` and its \a Context argument. - uint32_t Offset; - - //! \brief The size of a state component with a CPU-specific context - //! structure. - //! - //! This is equivalent to the size returned by `LocateXStateFeature()` in \a - //! Length. - uint32_t Size; -}; - -//! \anchor IMAGE_DEBUG_MISC_x -//! \name IMAGE_DEBUG_MISC_* -//! -//! Data type values for IMAGE_DEBUG_MISC::DataType. -//! \{ - -//! \brief A pointer to a `.dbg` file. -//! -//! IMAGE_DEBUG_MISC::Data will contain the path or file name of the `.dbg` file -//! associated with the module. -#define IMAGE_DEBUG_MISC_EXENAME 1 - -//! \} - -//! \brief Miscellaneous debugging record. -//! -//! This structure is referenced by MINIDUMP_MODULE::MiscRecord. It is obsolete, -//! superseded by the CodeView record. -struct IMAGE_DEBUG_MISC { - //! \brief The type of data carried in the #Data field. - //! - //! This is a value of \ref IMAGE_DEBUG_MISC_x "IMAGE_DEBUG_MISC_*". - uint32_t DataType; - - //! \brief The length of this structure in bytes, including the entire #Data - //! field and its `NUL` terminator. - //! - //! \note The Windows documentation states that this field is rounded up to - //! nearest nearest 4-byte multiple. - uint32_t Length; - - //! \brief The encoding of the #Data field. - //! - //! If this field is `0`, #Data contains narrow or multibyte character data. - //! If this field is `1`, #Data is UTF-16-encoded. - //! - //! On Windows, with this field set to `0`, #Data will be encoded in the code - //! page of the system that linked the module. On other operating systems, - //! UTF-8 may be used. - uint8_t Unicode; - - uint8_t Reserved[3]; - - //! \brief The data carried within this structure. - //! - //! For string data, this field will be `NUL`-terminated. If #Unicode is `1`, - //! this field is UTF-16-encoded, and will be terminated by a UTF-16 `NUL` - //! code unit (two `NUL` bytes). - uint8_t Data[1]; -}; - -//! \anchor VER_NT_x -//! \name VER_NT_* -//! -//! \brief Operating system type values for MINIDUMP_SYSTEM_INFO::ProductType. -//! -//! \sa crashpad::MinidumpOSType -//! \{ -#define VER_NT_WORKSTATION 1 -#define VER_NT_DOMAIN_CONTROLLER 2 -#define VER_NT_SERVER 3 -//! \} - -//! \anchor VER_PLATFORM_x -//! \name VER_PLATFORM_* -//! -//! \brief Operating system family values for MINIDUMP_SYSTEM_INFO::PlatformId. -//! -//! \sa crashpad::MinidumpOS -//! \{ -#define VER_PLATFORM_WIN32s 0 -#define VER_PLATFORM_WIN32_WINDOWS 1 -#define VER_PLATFORM_WIN32_NT 2 -//! \} - -#endif // CRASHPAD_COMPAT_NON_WIN_WINNT_H_ diff --git a/Tools/Crashpad/include/compat/win/getopt.h b/Tools/Crashpad/include/compat/win/getopt.h deleted file mode 100644 index 45fcbccc39..0000000000 --- a/Tools/Crashpad/include/compat/win/getopt.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_GETOPT_H_ -#define CRASHPAD_COMPAT_WIN_GETOPT_H_ - -#include "third_party/getopt/getopt.h" - -#endif // CRASHPAD_COMPAT_WIN_GETOPT_H_ diff --git a/Tools/Crashpad/include/compat/win/strings.h b/Tools/Crashpad/include/compat/win/strings.h deleted file mode 100644 index 50360b16d7..0000000000 --- a/Tools/Crashpad/include/compat/win/strings.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_STRINGS_H_ -#define CRASHPAD_COMPAT_WIN_STRINGS_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -int strcasecmp(const char* s1, const char* s2); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // CRASHPAD_COMPAT_WIN_STRINGS_H_ diff --git a/Tools/Crashpad/include/compat/win/sys/time.h b/Tools/Crashpad/include/compat/win/sys/time.h deleted file mode 100644 index 71ddcdc21f..0000000000 --- a/Tools/Crashpad/include/compat/win/sys/time.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_SYS_TIME_H_ -#define CRASHPAD_COMPAT_WIN_SYS_TIME_H_ - -#include - -#endif // CRASHPAD_COMPAT_WIN_SYS_TIME_H_ diff --git a/Tools/Crashpad/include/compat/win/sys/types.h b/Tools/Crashpad/include/compat/win/sys/types.h deleted file mode 100644 index e8fae88f4a..0000000000 --- a/Tools/Crashpad/include/compat/win/sys/types.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_SYS_TYPES_H_ -#define CRASHPAD_COMPAT_WIN_SYS_TYPES_H_ - -// This is intended to be roughly equivalent to #include_next. -#include <../ucrt/sys/types.h> - -#include - -#endif // CRASHPAD_COMPAT_WIN_SYS_TYPES_H_ diff --git a/Tools/Crashpad/include/compat/win/time.h b/Tools/Crashpad/include/compat/win/time.h deleted file mode 100644 index 37048daf71..0000000000 --- a/Tools/Crashpad/include/compat/win/time.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_TIME_H_ -#define CRASHPAD_COMPAT_WIN_TIME_H_ - -// This is intended to be roughly equivalent to #include_next. -#include <../ucrt/time.h> - -#ifdef __cplusplus -extern "C" { -#endif - -struct tm* gmtime_r(const time_t* timep, struct tm* result); - -struct tm* localtime_r(const time_t* timep, struct tm* result); - -const char* strptime(const char* buf, const char* format, struct tm* tm); - -time_t timegm(struct tm* tm); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // CRASHPAD_COMPAT_WIN_TIME_H_ diff --git a/Tools/Crashpad/include/compat/win/winbase.h b/Tools/Crashpad/include/compat/win/winbase.h deleted file mode 100644 index ffd850bf28..0000000000 --- a/Tools/Crashpad/include/compat/win/winbase.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_WINBASE_H_ -#define CRASHPAD_COMPAT_WIN_WINBASE_H_ - -// include_next -#include <../um/winbase.h> - -// 10.0.15063.0 SDK - -#ifndef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE -#define SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE (0x2) -#endif - -#endif // CRASHPAD_COMPAT_WIN_WINBASE_H_ diff --git a/Tools/Crashpad/include/compat/win/winnt.h b/Tools/Crashpad/include/compat/win/winnt.h deleted file mode 100644 index 34ea80f91c..0000000000 --- a/Tools/Crashpad/include/compat/win/winnt.h +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_WINNT_H_ -#define CRASHPAD_COMPAT_WIN_WINNT_H_ - -// include_next -#include <../um/winnt.h> - -// https://msdn.microsoft.com/library/aa373184.aspx: "Note that this structure -// definition was accidentally omitted from WinNT.h." -struct PROCESSOR_POWER_INFORMATION { - ULONG Number; - ULONG MaxMhz; - ULONG CurrentMhz; - ULONG MhzLimit; - ULONG MaxIdleState; - ULONG CurrentIdleState; -}; - -// 10.0.10240.0 SDK - -#ifndef PROCESSOR_ARCHITECTURE_ARM64 -#define PROCESSOR_ARCHITECTURE_ARM64 12 -#endif - -#ifndef PF_ARM_V8_INSTRUCTIONS_AVAILABLE -#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 -#endif - -#ifndef PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE -#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 -#endif - -#ifndef PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE -#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 -#endif - -#ifndef PF_RDTSCP_INSTRUCTION_AVAILABLE -#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32 -#endif - -// 10.0.14393.0 SDK - -#ifndef PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 -#define PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64 13 -#endif - -#endif // CRASHPAD_COMPAT_WIN_WINNT_H_ diff --git a/Tools/Crashpad/include/compat/win/winternl.h b/Tools/Crashpad/include/compat/win/winternl.h deleted file mode 100644 index ee4f53c654..0000000000 --- a/Tools/Crashpad/include/compat/win/winternl.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_COMPAT_WIN_WINTERNL_H_ -#define CRASHPAD_COMPAT_WIN_WINTERNL_H_ - -// include_next -#include <../um/winternl.h> - -// 10.0.16299.0 SDK - -typedef struct _CLIENT_ID CLIENT_ID; - -#endif // CRASHPAD_COMPAT_WIN_WINTERNL_H_ diff --git a/Tools/Crashpad/include/handler/crash_report_upload_thread.h b/Tools/Crashpad/include/handler/crash_report_upload_thread.h deleted file mode 100644 index cdd1502b7e..0000000000 --- a/Tools/Crashpad/include/handler/crash_report_upload_thread.h +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ -#define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ - -#include -#include - -#include "base/macros.h" -#include "client/crash_report_database.h" -#include "util/misc/uuid.h" -#include "util/stdlib/thread_safe_vector.h" -#include "util/thread/worker_thread.h" - -namespace crashpad { - -//! \brief A thread that processes pending crash reports in a -//! CrashReportDatabase by uploading them or marking them as completed -//! without upload, as desired. -//! -//! A producer of crash reports should notify an object of this class that a new -//! report has been added to the database by calling ReportPending(). -//! -//! Independently of being triggered by ReportPending(), objects of this class -//! can periodically examine the database for pending reports. This allows -//! failed upload attempts for reports left in the pending state to be retried. -//! It also catches reports that are added without a ReportPending() signal -//! being caught. This may happen if crash reports are added to the database by -//! other processes. -class CrashReportUploadThread : public WorkerThread::Delegate { - public: - //! \brief Options to be passed to the CrashReportUploadThread constructor. - struct Options { - //! Whether client identifying parameters like product name or version - //! should be added to the URL. - bool identify_client_via_url; - - //! Whether uploads should be throttled to a (currently hardcoded) rate. - bool rate_limit; - - //! Whether uploads should use `gzip` compression. - bool upload_gzip; - - //! Whether to periodically check for new pending reports not already known - //! to exist. When `false`, only an initial upload attempt will be made for - //! reports known to exist by having been added by the ReportPending() - //! method. No scans for new pending reports will be conducted. - bool watch_pending_reports; - }; - - //! \brief Constructs a new object. - //! - //! \param[in] database The database to upload crash reports from. - //! \param[in] url The URL of the server to upload crash reports to. - //! \param[in] options Options for the report uploads. - CrashReportUploadThread(CrashReportDatabase* database, - const std::string& url, - const Options& options); - ~CrashReportUploadThread(); - - //! \brief Starts a dedicated upload thread, which executes ThreadMain(). - //! - //! This method may only be be called on a newly-constructed object or after - //! a call to Stop(). - void Start(); - - //! \brief Stops the upload thread. - //! - //! The upload thread will terminate after completing whatever task it is - //! performing. If it is not performing any task, it will terminate - //! immediately. This method blocks while waiting for the upload thread to - //! terminate. - //! - //! This method must only be called after Start(). If Start() has been called, - //! this method must be called before destroying an object of this class. - //! - //! This method may be called from any thread other than the upload thread. - //! It is expected to only be called from the same thread that called Start(). - void Stop(); - - //! \brief Informs the upload thread that a new pending report has been added - //! to the database. - //! - //! \param[in] report_uuid The unique identifier of the newly added pending - //! report. - //! - //! This method may be called from any thread. - void ReportPending(const UUID& report_uuid); - - private: - //! \brief The result code from UploadReport(). - enum class UploadResult { - //! \brief The crash report was uploaded successfully. - kSuccess, - - //! \brief The crash report upload failed in such a way that recovery is - //! impossible. - //! - //! No further upload attempts should be made for the report. - kPermanentFailure, - - //! \brief The crash report upload failed, but it might succeed again if - //! retried in the future. - //! - //! If the report has not already been retried too many times, the caller - //! may arrange to call UploadReport() for the report again in the future, - //! after a suitable delay. - kRetry, - }; - - //! \brief Calls ProcessPendingReport() on pending reports. - //! - //! Assuming Stop() has not been called, this will process reports that the - //! object has been made aware of in ReportPending(). Additionally, if the - //! object was constructed with \a watch_pending_reports, it will also scan - //! the crash report database for other pending reports, and process those as - //! well. - void ProcessPendingReports(); - - //! \brief Processes a single pending report from the database. - //! - //! \param[in] report The crash report to process. - //! - //! If report upload is enabled, this method attempts to upload \a report by - //! calling UplaodReport(). If the upload is successful, the report will be - //! marked as “completed” in the database. If the upload fails and more - //! retries are desired, the report’s upload-attempt count and - //! last-upload-attempt time will be updated in the database and it will - //! remain in the “pending” state. If the upload fails and no more retries are - //! desired, or report upload is disabled, it will be marked as “completed” in - //! the database without ever having been uploaded. - void ProcessPendingReport(const CrashReportDatabase::Report& report); - - //! \brief Attempts to upload a crash report. - //! - //! \param[in] report The report to upload. The caller is responsible for - //! calling CrashReportDatabase::GetReportForUploading() before calling - //! this method, and for calling - //! CrashReportDatabase::RecordUploadAttempt() after calling this method. - //! \param[out] response_body If the upload attempt is successful, this will - //! be set to the response body sent by the server. Breakpad-type servers - //! provide the crash ID assigned by the server in the response body. - //! - //! \return A member of UploadResult indicating the result of the upload - //! attempt. - UploadResult UploadReport(const CrashReportDatabase::Report* report, - std::string* response_body); - - // WorkerThread::Delegate: - //! \brief Calls ProcessPendingReports() in response to ReportPending() having - //! been called on any thread, as well as periodically on a timer. - void DoWork(const WorkerThread* thread) override; - - const Options options_; - const std::string url_; - WorkerThread thread_; - ThreadSafeVector known_pending_report_uuids_; - CrashReportDatabase* database_; // weak - - DISALLOW_COPY_AND_ASSIGN(CrashReportUploadThread); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ diff --git a/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h deleted file mode 100644 index c987a5dc22..0000000000 --- a/Tools/Crashpad/include/handler/fuchsia/crash_report_exception_handler.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_ -#define CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_ - -#include -#include - -#include "base/macros.h" -#include "client/crash_report_database.h" -#include "handler/crash_report_upload_thread.h" -#include "handler/user_stream_data_source.h" - -namespace crashpad { - -//! \brief An exception handler that writes crash reports for exception messages -//! to a CrashReportDatabase. This class is not yet implemented. -class CrashReportExceptionHandler { - public: - //! \brief Creates a new object that will store crash reports in \a database. - //! - //! \param[in] database The database to store crash reports in. Weak. - //! \param[in] upload_thread The upload thread to notify when a new crash - //! report is written into \a database. - //! \param[in] process_annotations A map of annotations to insert as - //! process-level annotations into each crash report that is written. Do - //! not confuse this with module-level annotations, which are under the - //! control of the crashing process, and are used to implement Chrome's - //! "crash keys." Process-level annotations are those that are beyond the - //! control of the crashing process, which must reliably be set even if - //! the process crashes before it’s able to establish its own annotations. - //! To interoperate with Breakpad servers, the recommended practice is to - //! specify values for the `"prod"` and `"ver"` keys as process - //! annotations. - //! \param[in] user_stream_data_sources Data sources to be used to extend - //! crash reports. For each crash report that is written, the data sources - //! are called in turn. These data sources may contribute additional - //! minidump streams. `nullptr` if not required. - CrashReportExceptionHandler( - CrashReportDatabase* database, - CrashReportUploadThread* upload_thread, - const std::map* process_annotations, - const UserStreamDataSources* user_stream_data_sources); - - ~CrashReportExceptionHandler(); - - private: - DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_FUCHSIA_CRASH_REPORT_EXCEPTION_HANDLER_H_ diff --git a/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h b/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h deleted file mode 100644 index b998ba9cf0..0000000000 --- a/Tools/Crashpad/include/handler/fuchsia/exception_handler_server.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_ -#define CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_ - -#include "base/macros.h" - -namespace crashpad { - -class CrashReportExceptionHandler; - -//! \brief Runs the main exception-handling server in Crashpad's handler -//! process. This class is not yet implemented. -class ExceptionHandlerServer { - public: - //! \brief Constructs an ExceptionHandlerServer object. - ExceptionHandlerServer(); - ~ExceptionHandlerServer(); - - //! \brief Runs the exception-handling server. - //! - //! \param[in] handler The handler to which the exceptions are delegated when - //! they are caught in Run(). Ownership is not transferred. - void Run(CrashReportExceptionHandler* handler); - - private: - DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_FUCHSIA_EXCEPTION_HANDLER_SERVER_H_ diff --git a/Tools/Crashpad/include/handler/handler_main.h b/Tools/Crashpad/include/handler/handler_main.h deleted file mode 100644 index af01dbe735..0000000000 --- a/Tools/Crashpad/include/handler/handler_main.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_HANDLER_MAIN_H_ -#define CRASHPAD_HANDLER_HANDLER_MAIN_H_ - -#include "handler/user_stream_data_source.h" - -namespace crashpad { - -//! \brief The `main()` of the `crashpad_handler` binary. -//! -//! This is exposed so that `crashpad_handler` can be embedded into another -//! binary, but called and used as if it were a standalone executable. -//! -//! \param[in] argc \a argc as passed to `main()`. -//! \param[in] argv \a argv as passed to `main()`. -//! \param[in] user_stream_sources An optional vector containing the -//! extensibility data sources to call on crash. Each time a minidump is -//! created, the sources are called in turn. Any streams returned are added -//! to the minidump. -int HandlerMain(int argc, - char* argv[], - const UserStreamDataSources* user_stream_sources); - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_HANDLER_MAIN_H_ diff --git a/Tools/Crashpad/include/handler/linux/exception_handler_server.h b/Tools/Crashpad/include/handler/linux/exception_handler_server.h deleted file mode 100644 index fcafb887a1..0000000000 --- a/Tools/Crashpad/include/handler/linux/exception_handler_server.h +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_ -#define CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_ - -#include -#include - -#include -#include - -#include "base/macros.h" -#include "util/file/file_io.h" -#include "util/linux/exception_handler_protocol.h" -#include "util/misc/address_types.h" -#include "util/misc/initialization_state_dcheck.h" - -namespace crashpad { - -//! \brief Abstract base class for deciding how the handler should `ptrace` a -//! client. -class PtraceStrategyDecider { - public: - virtual ~PtraceStrategyDecider() = default; - - //! \brief The possible return values for ChooseStrategy(). - enum class Strategy { - //! \brief An error occurred, with a message logged. - kError, - - //! \brief Ptrace cannot be used. - kNoPtrace, - - //! \brief The handler should `ptrace`-attach the client directly. - kDirectPtrace, - - //! \brief The client should `fork` a PtraceBroker for the handler. - kForkBroker, - }; - - //! \brief Chooses an appropriate `ptrace` strategy. - //! - //! \param[in] sock A socket conncted to a ExceptionHandlerClient. - //! \param[in] client_credentials The credentials for the connected client. - //! \return the chosen #Strategy. - virtual Strategy ChooseStrategy(int sock, - const ucred& client_credentials) = 0; - - protected: - PtraceStrategyDecider() = default; -}; - -//! \brief Runs the main exception-handling server in Crashpad’s handler -//! process. -class ExceptionHandlerServer { - public: - class Delegate { - public: - //! \brief Called on receipt of a crash dump request from a client. - //! - //! \param[in] client_process_id The process ID of the crashing client. - //! \param[in] exception_information_address The address in the client's - //! address space of an ExceptionInformation struct. - //! \return `true` on success. `false` on failure with a message logged. - virtual bool HandleException(pid_t client_process_id, - VMAddress exception_information_address) = 0; - - //! \brief Called on the receipt of a crash dump request from a client for a - //! crash that should be mediated by a PtraceBroker. - //! - //! \param[in] client_process_id The process ID of the crashing client. - //! \param[in] exception_information_address The address in the client's - //! address space of an ExceptionInformation struct. - //! \param[in] broker_sock A socket connected to the PtraceBroker. - //! \return `true` on success. `false` on failure with a message logged. - virtual bool HandleExceptionWithBroker( - pid_t client_process_id, - VMAddress exception_information_address, - int broker_sock) = 0; - - protected: - ~Delegate() {} - }; - - ExceptionHandlerServer(); - ~ExceptionHandlerServer(); - - //! \brief Sets the handler's PtraceStrategyDecider. - //! - //! If this method is not called, a default PtraceStrategyDecider will be - //! used. - void SetPtraceStrategyDecider(std::unique_ptr decider); - - //! \brief Initializes this object. - //! - //! This method must be successfully called before Run(). - //! - //! \param[in] sock A socket on which to receive client requests. - //! \return `true` on success. `false` on failure with a message logged. - bool InitializeWithClient(ScopedFileHandle sock); - - //! \brief Runs the exception-handling server. - //! - //! This method must only be called once on an ExceptionHandlerServer object. - //! This method returns when there are no more client connections or Stop() - //! has been called. - //! - //! \param[in] delegate An object to send exceptions to. - void Run(Delegate* delegate); - - //! \brief Stops a running exception-handling server. - //! - //! Stop() may be called at any time, and may be called from a signal handler. - //! If Stop() is called before Run() it will cause Run() to return as soon as - //! it is called. It is harmless to call Stop() after Run() has already - //! returned, or to call Stop() after it has already been called. - void Stop(); - - private: - struct Event; - - void HandleEvent(Event* event, uint32_t event_type); - bool InstallClientSocket(ScopedFileHandle socket); - bool UninstallClientSocket(Event* event); - bool ReceiveClientMessage(Event* event); - bool HandleCrashDumpRequest(const msghdr& msg, - const ClientInformation& client_info, - int client_sock); - - std::unordered_map> clients_; - std::unique_ptr shutdown_event_; - std::unique_ptr strategy_decider_; - Delegate* delegate_; - ScopedFileHandle pollfd_; - bool keep_running_; - InitializationStateDcheck initialized_; - - DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_LINUX_EXCEPTION_HANDLER_SERVER_H_ diff --git a/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h deleted file mode 100644 index cc314f1fc9..0000000000 --- a/Tools/Crashpad/include/handler/mac/crash_report_exception_handler.h +++ /dev/null @@ -1,93 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_ -#define CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_ - -#include - -#include -#include - -#include "base/macros.h" -#include "client/crash_report_database.h" -#include "handler/crash_report_upload_thread.h" -#include "handler/user_stream_data_source.h" -#include "util/mach/exc_server_variants.h" - -namespace crashpad { - -//! \brief An exception handler that writes crash reports for exception messages -//! to a CrashReportDatabase. -class CrashReportExceptionHandler : public UniversalMachExcServer::Interface { - public: - //! \brief Creates a new object that will store crash reports in \a database. - //! - //! \param[in] database The database to store crash reports in. Weak. - //! \param[in] upload_thread The upload thread to notify when a new crash - //! report is written into \a database. - //! \param[in] process_annotations A map of annotations to insert as - //! process-level annotations into each crash report that is written. Do - //! not confuse this with module-level annotations, which are under the - //! control of the crashing process, and are used to implement Chrome’s - //! “crash keys.” Process-level annotations are those that are beyond the - //! control of the crashing process, which must reliably be set even if - //! the process crashes before it’s able to establish its own annotations. - //! To interoperate with Breakpad servers, the recommended practice is to - //! specify values for the `"prod"` and `"ver"` keys as process - //! annotations. - //! \param[in] user_stream_data_sources Data sources to be used to extend - //! crash reports. For each crash report that is written, the data sources - //! are called in turn. These data sources may contribute additional - //! minidump streams. `nullptr` if not required. - CrashReportExceptionHandler( - CrashReportDatabase* database, - CrashReportUploadThread* upload_thread, - const std::map* process_annotations, - const UserStreamDataSources* user_stream_data_sources); - - ~CrashReportExceptionHandler(); - - // UniversalMachExcServer::Interface: - - //! \brief Processes an exception message by writing a crash report to this - //! object’s CrashReportDatabase. - kern_return_t CatchMachException( - exception_behavior_t behavior, - exception_handler_t exception_port, - thread_t thread, - task_t task, - exception_type_t exception, - const mach_exception_data_type_t* code, - mach_msg_type_number_t code_count, - thread_state_flavor_t* flavor, - ConstThreadState old_state, - mach_msg_type_number_t old_state_count, - thread_state_t new_state, - mach_msg_type_number_t* new_state_count, - const mach_msg_trailer_t* trailer, - bool* destroy_complex_request) override; - - private: - CrashReportDatabase* database_; // weak - CrashReportUploadThread* upload_thread_; // weak - const std::map* process_annotations_; // weak - const UserStreamDataSources* user_stream_data_sources_; // weak - - DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_MAC_CRASH_REPORT_EXCEPTION_HANDLER_H_ diff --git a/Tools/Crashpad/include/handler/mac/exception_handler_server.h b/Tools/Crashpad/include/handler/mac/exception_handler_server.h deleted file mode 100644 index 272cf76244..0000000000 --- a/Tools/Crashpad/include/handler/mac/exception_handler_server.h +++ /dev/null @@ -1,82 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ -#define CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ - -#include - -#include "base/mac/scoped_mach_port.h" -#include "base/macros.h" -#include "util/mach/exc_server_variants.h" - -namespace crashpad { - -//! \brief Runs the main exception-handling server in Crashpad’s handler -//! process. -class ExceptionHandlerServer { - public: - //! \brief Constructs an ExceptionHandlerServer object. - //! - //! \param[in] receive_port The port that exception messages and no-senders - //! notifications will be received on. - //! \param[in] launchd If `true`, the exception handler is being run from - //! launchd. \a receive_port is not monitored for no-senders - //! notifications, and instead, Stop() must be called to provide a “quit” - //! signal. - ExceptionHandlerServer(base::mac::ScopedMachReceiveRight receive_port, - bool launchd); - ~ExceptionHandlerServer(); - - //! \brief Runs the exception-handling server. - //! - //! \param[in] exception_interface An object to send exception messages to. - //! - //! This method monitors the receive port for exception messages and, if - //! not being run by launchd, no-senders notifications. It continues running - //! until it has no more clients, indicated by the receipt of a no-senders - //! notification, or until Stop() is called. When not being run by launchd, it - //! is important to assure that a send right exists in a client (or has been - //! queued by `mach_msg()` to be sent to a client) prior to calling this - //! method, or it will detect that it is sender-less and return immediately. - //! - //! All exception messages will be passed to \a exception_interface. - //! - //! This method must only be called once on an ExceptionHandlerServer object. - //! - //! If an unexpected condition that prevents this method from functioning is - //! encountered, it will log a message and terminate execution. Receipt of an - //! invalid message on the receive port will cause a message to be logged, but - //! this method will continue running normally. - void Run(UniversalMachExcServer::Interface* exception_interface); - - //! \brief Stops a running exception-handling server. - //! - //! Stop() may be called at any time, and may be called from a signal handler. - //! If Stop() is called before Run() it will cause Run() to return as soon as - //! it is called. It is harmless to call Stop() after Run() has already - //! returned, or to call Stop() after it has already been called. - void Stop(); - - private: - base::mac::ScopedMachReceiveRight receive_port_; - base::mac::ScopedMachReceiveRight notify_port_; - bool launchd_; - - DISALLOW_COPY_AND_ASSIGN(ExceptionHandlerServer); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ diff --git a/Tools/Crashpad/include/handler/mac/file_limit_annotation.h b/Tools/Crashpad/include/handler/mac/file_limit_annotation.h deleted file mode 100644 index 1131986e63..0000000000 --- a/Tools/Crashpad/include/handler/mac/file_limit_annotation.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_ -#define CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_ - -namespace crashpad { - -//! \brief Records a `"file-limits"` simple annotation for the process. -//! -//! This annotation will be used to confirm the theory that certain crashes are -//! caused by systems at or near their file descriptor table size limits. -//! -//! The format of the annotation is four comma-separated values: the system-wide -//! `kern.num_files` and `kern.maxfiles` values from `sysctl()`, and the -//! process-specific current and maximum file descriptor limits from -//! `getrlimit(RLIMIT_NOFILE, …)`. -//! -//! See https://crashpad.chromium.org/bug/180. -//! -//! TODO(mark): Remove this annotation after sufficient data has been collected -//! for analysis. -void RecordFileLimitAnnotation(); - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_MAC_FILE_LIMIT_ANNOTATION_H_ diff --git a/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h b/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h deleted file mode 100644 index 41056f7033..0000000000 --- a/Tools/Crashpad/include/handler/minidump_to_upload_parameters.h +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_ -#define HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_ - -#include -#include - -#include "snapshot/process_snapshot.h" - -namespace crashpad { - -//! \brief Given a ProcessSnapshot, returns a map of key-value pairs to use as -//! HTTP form parameters for upload to a Breakpad crash report colleciton -//! server. -//! -//! The map is built by combining the process simple annotations map with -//! each module’s simple annotations map and annotation objects. -//! -//! In the case of duplicate simple map keys or annotation names, the map will -//! retain the first value found for any key, and will log a warning about -//! discarded values. The precedence rules for annotation names are: the two -//! reserved keys discussed below, process simple annotations, module simple -//! annotations, and module annotation objects. -//! -//! For annotation objects, only ones of that are Annotation::Type::kString are -//! included. -//! -//! Each module’s annotations vector is also examined and built into a single -//! string value, with distinct elements separated by newlines, and stored at -//! the key named “list_annotations”, which supersedes any other key found by -//! that name. -//! -//! The client ID stored in the minidump is converted to a string and stored at -//! the key named “guid”, which supersedes any other key found by that name. -//! -//! In the event of an error reading the minidump file, a message will be -//! logged. -//! -//! \param[in] process_snapshot The process snapshot from which annotations -//! will be extracted. -//! -//! \returns A string map of the annotations. -std::map BreakpadHTTPFormParametersFromMinidump( - const ProcessSnapshot* process_snapshot); - -} // namespace crashpad - -#endif // HANDLER_MINIDUMP_TO_UPLOAD_PARAMETERS_H_ diff --git a/Tools/Crashpad/include/handler/prune_crash_reports_thread.h b/Tools/Crashpad/include/handler/prune_crash_reports_thread.h deleted file mode 100644 index 72b69fc640..0000000000 --- a/Tools/Crashpad/include/handler/prune_crash_reports_thread.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2016 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_ -#define CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_ - -#include - -#include "base/macros.h" -#include "util/thread/worker_thread.h" - -namespace crashpad { - -class CrashReportDatabase; -class PruneCondition; - -//! \brief A thread that periodically prunes crash reports from the database -//! using the specified condition. -//! -//! After the thread is started, the database is pruned using the condition -//! every 24 hours. Upon calling Start(), the thread waits 10 minutes before -//! performing the initial prune operation. -class PruneCrashReportThread : public WorkerThread::Delegate { - public: - //! \brief Constructs a new object. - //! - //! \param[in] database The database to prune crash reports from. - //! \param[in] condition The condition used to evaluate crash reports for - //! pruning. - PruneCrashReportThread(CrashReportDatabase* database, - std::unique_ptr condition); - ~PruneCrashReportThread(); - - //! \brief Starts a dedicated pruning thread. - //! - //! The thread waits before running the initial prune, so as to not interfere - //! with any startup-related IO performed by the client. - //! - //! This method may only be be called on a newly-constructed object or after - //! a call to Stop(). - void Start(); - - //! \brief Stops the pruning thread. - //! - //! This method must only be called after Start(). If Start() has been called, - //! this method must be called before destroying an object of this class. - //! - //! This method may be called from any thread other than the pruning thread. - //! It is expected to only be called from the same thread that called Start(). - void Stop(); - - private: - // WorkerThread::Delegate: - void DoWork(const WorkerThread* thread) override; - - WorkerThread thread_; - std::unique_ptr condition_; - CrashReportDatabase* database_; // weak - - DISALLOW_COPY_AND_ASSIGN(PruneCrashReportThread); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_PRUNE_CRASH_REPORTS_THREAD_H_ diff --git a/Tools/Crashpad/include/handler/user_stream_data_source.h b/Tools/Crashpad/include/handler/user_stream_data_source.h deleted file mode 100644 index 11bb9c3d47..0000000000 --- a/Tools/Crashpad/include/handler/user_stream_data_source.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_ -#define CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_ - -#include -#include - -namespace crashpad { - -class MinidumpFileWriter; -class MinidumpUserExtensionStreamDataSource; -class ProcessSnapshot; - -//! \brief Extensibility interface for embedders who wish to add custom streams -//! to minidumps. -class UserStreamDataSource { - public: - virtual ~UserStreamDataSource() {} - - //! \brief Produce the contents for an extension stream for a crashed program. - //! - //! Called after \a process_snapshot has been initialized for the crashed - //! process to (optionally) produce the contents of a user extension stream - //! that will be attached to the minidump. - //! - //! \param[in] process_snapshot An initialized snapshot for the crashed - //! process. - //! - //! \return A new data source for the stream to add to the minidump or - //! `nullptr` on failure or to opt out of adding a stream. - virtual std::unique_ptr - ProduceStreamData(ProcessSnapshot* process_snapshot) = 0; -}; - -using UserStreamDataSources = - std::vector>; - -//! \brief Adds user extension streams to a minidump. -//! -//! Dispatches to each source in \a user_stream_data_sources and adds returned -//! extension streams to \a minidump_file_writer. -//! -//! \param[in] user_stream_data_sources A pointer to the data sources, or -//! `nullptr`. -//! \param[in] process_snapshot An initialized snapshot to the crashing process. -//! \param[in] minidump_file_writer Any extension streams will be added to this -//! minidump. -void AddUserExtensionStreams( - const UserStreamDataSources* user_stream_data_sources, - ProcessSnapshot* process_snapshot, - MinidumpFileWriter* minidump_file_writer); - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_USER_STREAM_DATA_SOURCE_H_ diff --git a/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h b/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h deleted file mode 100644 index e1fb725d0d..0000000000 --- a/Tools/Crashpad/include/handler/win/crash_report_exception_handler.h +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_ -#define CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_ - -#include - -#include -#include - -#include "base/macros.h" -#include "handler/user_stream_data_source.h" -#include "util/win/exception_handler_server.h" - -namespace crashpad { - -class CrashReportDatabase; -class CrashReportUploadThread; - -//! \brief An exception handler that writes crash reports for exception messages -//! to a CrashReportDatabase. -class CrashReportExceptionHandler : public ExceptionHandlerServer::Delegate { - public: - //! \brief Creates a new object that will store crash reports in \a database. - //! - //! \param[in] database The database to store crash reports in. Weak. - //! \param[in] upload_thread The upload thread to notify when a new crash - //! report is written into \a database. - //! \param[in] process_annotations A map of annotations to insert as - //! process-level annotations into each crash report that is written. Do - //! not confuse this with module-level annotations, which are under the - //! control of the crashing process, and are used to implement Chrome's - //! "crash keys." Process-level annotations are those that are beyond the - //! control of the crashing process, which must reliably be set even if - //! the process crashes before it's able to establish its own annotations. - //! To interoperate with Breakpad servers, the recommended practice is to - //! specify values for the `"prod"` and `"ver"` keys as process - //! annotations. - //! \param[in] user_stream_data_sources Data sources to be used to extend - //! crash reports. For each crash report that is written, the data sources - //! are called in turn. These data sources may contribute additional - //! minidump streams. `nullptr` if not required. - CrashReportExceptionHandler( - CrashReportDatabase* database, - CrashReportUploadThread* upload_thread, - const std::map* process_annotations, - const UserStreamDataSources* user_stream_data_sources); - - ~CrashReportExceptionHandler(); - - // ExceptionHandlerServer::Delegate: - - //! \brief Processes an exception message by writing a crash report to this - //! object's CrashReportDatabase. - void ExceptionHandlerServerStarted() override; - unsigned int ExceptionHandlerServerException( - HANDLE process, - WinVMAddress exception_information_address, - WinVMAddress debug_critical_section_address) override; - - private: - CrashReportDatabase* database_; // weak - CrashReportUploadThread* upload_thread_; // weak - const std::map* process_annotations_; // weak - const UserStreamDataSources* user_stream_data_sources_; // weak - - DISALLOW_COPY_AND_ASSIGN(CrashReportExceptionHandler); -}; - -} // namespace crashpad - -#endif // CRASHPAD_HANDLER_WIN_CRASH_REPORT_EXCEPTION_HANDLER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_annotation_writer.h b/Tools/Crashpad/include/minidump/minidump_annotation_writer.h deleted file mode 100644 index fc30dbc3a4..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_annotation_writer.h +++ /dev/null @@ -1,109 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_ - -#include -#include - -#include "minidump/minidump_byte_array_writer.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_string_writer.h" -#include "minidump/minidump_writable.h" -#include "snapshot/annotation_snapshot.h" - -namespace crashpad { - -//! \brief The writer for a MinidumpAnnotation object in a minidump file. -//! -//! Because MinidumpAnnotation objects only appear as elements -//! of MinidumpAnnotationList objects, this class does not write any -//! data on its own. It makes its MinidumpAnnotation data available to its -//! MinidumpAnnotationList parent, which writes it as part of a -//! MinidumpAnnotationList. -class MinidumpAnnotationWriter final : public internal::MinidumpWritable { - public: - MinidumpAnnotationWriter(); - ~MinidumpAnnotationWriter(); - - //! \brief Initializes the annotation writer with data from an - //! AnnotationSnapshot. - void InitializeFromSnapshot(const AnnotationSnapshot& snapshot); - - //! \brief Initializes the annotation writer with data values. - void InitializeWithData(const std::string& name, - uint16_t type, - const std::vector& data); - - //! \brief Returns the MinidumpAnnotation referencing this object’s data. - const MinidumpAnnotation* minidump_annotation() const { return &annotation_; } - - protected: - // MinidumpWritable: - - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MinidumpAnnotation annotation_; - internal::MinidumpUTF8StringWriter name_; - MinidumpByteArrayWriter value_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpAnnotationWriter); -}; - -//! \brief The writer for a MinidumpAnnotationList object in a minidump file, -//! containing a list of MinidumpAnnotation objects. -class MinidumpAnnotationListWriter final : public internal::MinidumpWritable { - public: - MinidumpAnnotationListWriter(); - ~MinidumpAnnotationListWriter(); - - //! \brief Initializes the annotation list writer with a list of - //! AnnotationSnapshot objects. - void InitializeFromList(const std::vector& list); - - //! \brief Adds a single MinidumpAnnotationWriter to the list to be written. - void AddObject(std::unique_ptr annotation_writer); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying entries would be - //! considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - protected: - // MinidumpWritable: - - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - std::unique_ptr minidump_list_; - std::vector> objects_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpAnnotationListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_ANNOTATION_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h b/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h deleted file mode 100644 index c399f0358d..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_byte_array_writer.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_ - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -//! \brief Writes a variable-length byte array for a minidump into a -//! \sa MinidumpByteArray. -class MinidumpByteArrayWriter final : public internal::MinidumpWritable { - public: - MinidumpByteArrayWriter(); - ~MinidumpByteArrayWriter() override; - - //! \brief Sets the data to be written. - //! - //! \note Valid in #kStateMutable. - void set_data(const std::vector& data) { data_ = data; } - - //! \brief Sets the data to be written. - //! - //! \note Valid in #kStateMutable. - void set_data(const uint8_t* data, size_t size); - - //! \brief Gets the data to be written. - //! - //! \note Valid in any state. - const std::vector& data() const { return data_; } - - protected: - // MinidumpWritable: - - bool Freeze() override; - size_t SizeOfObject() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - std::unique_ptr minidump_array_; - std::vector data_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpByteArrayWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_BYTE_ARRAY_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_context.h b/Tools/Crashpad/include/minidump/minidump_context.h deleted file mode 100644 index 1226b654aa..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_context.h +++ /dev/null @@ -1,341 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ - -#include - -#include "base/compiler_specific.h" -#include "snapshot/cpu_context.h" -#include "util/numeric/int128.h" - -namespace crashpad { - -//! \brief Architecture-independent flags for `context_flags` fields in Minidump -//! context structures. -// -// https://zachsaw.blogspot.com/2010/11/wow64-bug-getthreadcontext-may-return.html#c5639760895973344002 -enum MinidumpContextFlags : uint32_t { - //! \brief The thread was executing a trap handler in kernel mode - //! (`CONTEXT_EXCEPTION_ACTIVE`). - //! - //! If this bit is set, it indicates that the context is from a thread that - //! was executing a trap handler in the kernel. This bit is only valid when - //! ::kMinidumpContextExceptionReporting is also set. This bit is only used on - //! Windows. - kMinidumpContextExceptionActive = 0x08000000, - - //! \brief The thread was executing a system call in kernel mode - //! (`CONTEXT_SERVICE_ACTIVE`). - //! - //! If this bit is set, it indicates that the context is from a thread that - //! was executing a system call in the kernel. This bit is only valid when - //! ::kMinidumpContextExceptionReporting is also set. This bit is only used on - //! Windows. - kMinidumpContextServiceActive = 0x10000000, - - //! \brief Kernel-mode state reporting is desired - //! (`CONTEXT_EXCEPTION_REQUEST`). - //! - //! This bit is not used in context structures containing snapshots of thread - //! CPU context. It used when calling `GetThreadContext()` on Windows to - //! specify that kernel-mode state reporting - //! (::kMinidumpContextExceptionReporting) is desired in the returned context - //! structure. - kMinidumpContextExceptionRequest = 0x40000000, - - //! \brief Kernel-mode state reporting is provided - //! (`CONTEXT_EXCEPTION_REPORTING`). - //! - //! If this bit is set, it indicates that the bits indicating how the thread - //! had entered kernel mode (::kMinidumpContextExceptionActive and - //! ::kMinidumpContextServiceActive) are valid. This bit is only used on - //! Windows. - kMinidumpContextExceptionReporting = 0x80000000, -}; - -//! \brief 32-bit x86-specifc flags for MinidumpContextX86::context_flags. -enum MinidumpContextX86Flags : uint32_t { - //! \brief Identifies the context structure as 32-bit x86. This is the same as - //! `CONTEXT_i386` and `CONTEXT_i486` on Windows for this architecture. - kMinidumpContextX86 = 0x00010000, - - //! \brief Indicates the validity of control registers (`CONTEXT_CONTROL`). - //! - //! The `ebp`, `eip`, `cs`, `eflags`, `esp`, and `ss` fields are valid. - kMinidumpContextX86Control = kMinidumpContextX86 | 0x00000001, - - //! \brief Indicates the validity of non-control integer registers - //! (`CONTEXT_INTEGER`). - //! - //! The `edi`, `esi`, `ebx`, `edx`, `ecx, and `eax` fields are valid. - kMinidumpContextX86Integer = kMinidumpContextX86 | 0x00000002, - - //! \brief Indicates the validity of non-control segment registers - //! (`CONTEXT_SEGMENTS`). - //! - //! The `gs`, `fs`, `es`, and `ds` fields are valid. - kMinidumpContextX86Segment = kMinidumpContextX86 | 0x00000004, - - //! \brief Indicates the validity of floating-point state - //! (`CONTEXT_FLOATING_POINT`). - //! - //! The `fsave` field is valid. The `float_save` field is included in this - //! definition, but its members have no practical use asdie from `fsave`. - kMinidumpContextX86FloatingPoint = kMinidumpContextX86 | 0x00000008, - - //! \brief Indicates the validity of debug registers - //! (`CONTEXT_DEBUG_REGISTERS`). - //! - //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid. - kMinidumpContextX86Debug = kMinidumpContextX86 | 0x00000010, - - //! \brief Indicates the validity of extended registers in `fxsave` format - //! (`CONTEXT_EXTENDED_REGISTERS`). - //! - //! The `extended_registers` field is valid and contains `fxsave` data. - kMinidumpContextX86Extended = kMinidumpContextX86 | 0x00000020, - - //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`). - //! - //! The context contains `xsave` data. This is used with an extended context - //! structure not currently defined here. - kMinidumpContextX86Xstate = kMinidumpContextX86 | 0x00000040, - - //! \brief Indicates the validity of control, integer, and segment registers. - //! (`CONTEXT_FULL`). - kMinidumpContextX86Full = kMinidumpContextX86Control | - kMinidumpContextX86Integer | - kMinidumpContextX86Segment, - - //! \brief Indicates the validity of all registers except `xsave` data. - //! (`CONTEXT_ALL`). - kMinidumpContextX86All = kMinidumpContextX86Full | - kMinidumpContextX86FloatingPoint | - kMinidumpContextX86Debug | - kMinidumpContextX86Extended, -}; - -//! \brief A 32-bit x86 CPU context (register state) carried in a minidump file. -//! -//! This is analogous to the `CONTEXT` structure on Windows when targeting -//! 32-bit x86, and the `WOW64_CONTEXT` structure when targeting an x86-family -//! CPU, either 32- or 64-bit. This structure is used instead of `CONTEXT` or -//! `WOW64_CONTEXT` to make it available when targeting other architectures. -//! -//! \note This structure doesn’t carry `dr4` or `dr5`, which are obsolete and -//! normally alias `dr6` and `dr7`, respectively. See Intel Software -//! Developer’s Manual, Volume 3B: System Programming, Part 2 (253669-052), -//! 17.2.2 “Debug Registers DR4 and DR5”. -struct MinidumpContextX86 { - //! \brief A bitfield composed of values of #MinidumpContextFlags and - //! #MinidumpContextX86Flags. - //! - //! This field identifies the context structure as a 32-bit x86 CPU context, - //! and indicates which other fields in the structure are valid. - uint32_t context_flags; - - uint32_t dr0; - uint32_t dr1; - uint32_t dr2; - uint32_t dr3; - uint32_t dr6; - uint32_t dr7; - - // CPUContextX86::Fsave has identical layout to what the x86 CONTEXT structure - // places here. - CPUContextX86::Fsave fsave; - union { - uint32_t spare_0; // As in the native x86 CONTEXT structure since Windows 8 - uint32_t cr0_npx_state; // As in WOW64_CONTEXT and older SDKs’ x86 CONTEXT - } float_save; - - uint32_t gs; - uint32_t fs; - uint32_t es; - uint32_t ds; - - uint32_t edi; - uint32_t esi; - uint32_t ebx; - uint32_t edx; - uint32_t ecx; - uint32_t eax; - - uint32_t ebp; - uint32_t eip; - uint32_t cs; - uint32_t eflags; - uint32_t esp; - uint32_t ss; - - // CPUContextX86::Fxsave has identical layout to what the x86 CONTEXT - // structure places here. - CPUContextX86::Fxsave fxsave; -}; - -//! \brief x86_64-specific flags for MinidumpContextAMD64::context_flags. -enum MinidumpContextAMD64Flags : uint32_t { - //! \brief Identifies the context structure as x86_64. This is the same as - //! `CONTEXT_AMD64` on Windows for this architecture. - kMinidumpContextAMD64 = 0x00100000, - - //! \brief Indicates the validity of control registers (`CONTEXT_CONTROL`). - //! - //! The `cs`, `ss`, `eflags`, `rsp`, and `rip` fields are valid. - kMinidumpContextAMD64Control = kMinidumpContextAMD64 | 0x00000001, - - //! \brief Indicates the validity of non-control integer registers - //! (`CONTEXT_INTEGER`). - //! - //! The `rax`, `rcx`, `rdx`, `rbx`, `rbp`, `rsi`, `rdi`, and `r8` through - //! `r15` fields are valid. - kMinidumpContextAMD64Integer = kMinidumpContextAMD64 | 0x00000002, - - //! \brief Indicates the validity of non-control segment registers - //! (`CONTEXT_SEGMENTS`). - //! - //! The `ds`, `es`, `fs`, and `gs` fields are valid. - kMinidumpContextAMD64Segment = kMinidumpContextAMD64 | 0x00000004, - - //! \brief Indicates the validity of floating-point state - //! (`CONTEXT_FLOATING_POINT`). - //! - //! The `xmm0` through `xmm15` fields are valid. - kMinidumpContextAMD64FloatingPoint = kMinidumpContextAMD64 | 0x00000008, - - //! \brief Indicates the validity of debug registers - //! (`CONTEXT_DEBUG_REGISTERS`). - //! - //! The `dr0` through `dr3`, `dr6`, and `dr7` fields are valid. - kMinidumpContextAMD64Debug = kMinidumpContextAMD64 | 0x00000010, - - //! \brief Indicates the validity of `xsave` data (`CONTEXT_XSTATE`). - //! - //! The context contains `xsave` data. This is used with an extended context - //! structure not currently defined here. - kMinidumpContextAMD64Xstate = kMinidumpContextAMD64 | 0x00000040, - - //! \brief Indicates the validity of control, integer, and floating-point - //! registers (`CONTEXT_FULL`). - kMinidumpContextAMD64Full = kMinidumpContextAMD64Control | - kMinidumpContextAMD64Integer | - kMinidumpContextAMD64FloatingPoint, - - //! \brief Indicates the validity of all registers except `xsave` data - //! (`CONTEXT_ALL`). - kMinidumpContextAMD64All = kMinidumpContextAMD64Full | - kMinidumpContextAMD64Segment | - kMinidumpContextAMD64Debug, -}; - -//! \brief An x86_64 (AMD64) CPU context (register state) carried in a minidump -//! file. -//! -//! This is analogous to the `CONTEXT` structure on Windows when targeting -//! x86_64. This structure is used instead of `CONTEXT` to make it available -//! when targeting other architectures. -//! -//! \note This structure doesn’t carry `dr4` or `dr5`, which are obsolete and -//! normally alias `dr6` and `dr7`, respectively. See Intel Software -//! Developer’s Manual, Volume 3B: System Programming, Part 2 (253669-052), -//! 17.2.2 “Debug Registers DR4 and DR5”. -struct alignas(16) MinidumpContextAMD64 { - //! \brief Register parameter home address. - //! - //! On Windows, this field may contain the “home” address (on-stack, in the - //! shadow area) of a parameter passed by register. This field is present for - //! convenience but is not necessarily populated, even if a corresponding - //! parameter was passed by register. - //! - //! \{ - uint64_t p1_home; - uint64_t p2_home; - uint64_t p3_home; - uint64_t p4_home; - uint64_t p5_home; - uint64_t p6_home; - //! \} - - //! \brief A bitfield composed of values of #MinidumpContextFlags and - //! #MinidumpContextAMD64Flags. - //! - //! This field identifies the context structure as an x86_64 CPU context, and - //! indicates which other fields in the structure are valid. - uint32_t context_flags; - - uint32_t mx_csr; - - uint16_t cs; - uint16_t ds; - uint16_t es; - uint16_t fs; - uint16_t gs; - uint16_t ss; - - uint32_t eflags; - - uint64_t dr0; - uint64_t dr1; - uint64_t dr2; - uint64_t dr3; - uint64_t dr6; - uint64_t dr7; - - uint64_t rax; - uint64_t rcx; - uint64_t rdx; - uint64_t rbx; - uint64_t rsp; - uint64_t rbp; - uint64_t rsi; - uint64_t rdi; - uint64_t r8; - uint64_t r9; - uint64_t r10; - uint64_t r11; - uint64_t r12; - uint64_t r13; - uint64_t r14; - uint64_t r15; - - uint64_t rip; - - // CPUContextX86_64::Fxsave has identical layout to what the x86_64 CONTEXT - // structure places here. - CPUContextX86_64::Fxsave fxsave; - - uint128_struct vector_register[26]; - uint64_t vector_control; - - //! \brief Model-specific debug extension register. - //! - //! See Intel Software Developer’s Manual, Volume 3B: System Programming, Part - //! 2 (253669-051), 17.4 “Last Branch, Interrupt, and Exception Recording - //! Overview”, and AMD Architecture Programmer’s Manual, Volume 2: System - //! Programming (24593-3.24), 13.1.6 “Control-Transfer Breakpoint Features”. - //! - //! \{ - uint64_t debug_control; - uint64_t last_branch_to_rip; - uint64_t last_branch_from_rip; - uint64_t last_exception_to_rip; - uint64_t last_exception_from_rip; - //! \} -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_context_writer.h b/Tools/Crashpad/include/minidump/minidump_context_writer.h deleted file mode 100644 index 25d717e585..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_context_writer.h +++ /dev/null @@ -1,160 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ - -#include - -#include - -#include "base/macros.h" -#include "minidump/minidump_context.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -struct CPUContext; -struct CPUContextX86; -struct CPUContextX86_64; - -//! \brief The base class for writers of CPU context structures in minidump -//! files. -class MinidumpContextWriter : public internal::MinidumpWritable { - public: - ~MinidumpContextWriter() override; - - //! \brief Creates a MinidumpContextWriter based on \a context_snapshot. - //! - //! \param[in] context_snapshot The context snapshot to use as source data. - //! - //! \return A MinidumpContextWriter subclass, such as MinidumpContextWriterX86 - //! or MinidumpContextWriterAMD64, appropriate to the CPU type of \a - //! context_snapshot. The returned object is initialized using the source - //! data in \a context_snapshot. If \a context_snapshot is an unknown CPU - //! type’s context, logs a message and returns `nullptr`. - static std::unique_ptr CreateFromSnapshot( - const CPUContext* context_snapshot); - - protected: - MinidumpContextWriter() : MinidumpWritable() {} - - //! \brief Returns the size of the context structure that this object will - //! write. - //! - //! \note This method will only be called in #kStateFrozen or a subsequent - //! state. - virtual size_t ContextSize() const = 0; - - // MinidumpWritable: - size_t SizeOfObject() final; - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpContextWriter); -}; - -//! \brief The writer for a MinidumpContextX86 structure in a minidump file. -class MinidumpContextX86Writer final : public MinidumpContextWriter { - public: - MinidumpContextX86Writer(); - ~MinidumpContextX86Writer() override; - - //! \brief Initializes the MinidumpContextX86 based on \a context_snapshot. - //! - //! \param[in] context_snapshot The context snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutation of context() may be done before - //! calling this method, and it is not normally necessary to alter - //! context() after calling this method. - void InitializeFromSnapshot(const CPUContextX86* context_snapshot); - - //! \brief Returns a pointer to the context structure that this object will - //! write. - //! - //! \attention This returns a non-`const` pointer to this object’s private - //! data so that a caller can populate the context structure directly. - //! This is done because providing setter interfaces to each field in the - //! context structure would be unwieldy and cumbersome. Care must be taken - //! to populate the context structure correctly. The context structure - //! must only be modified while this object is in the #kStateMutable - //! state. - MinidumpContextX86* context() { return &context_; } - - protected: - // MinidumpWritable: - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpContextWriter: - size_t ContextSize() const override; - - private: - MinidumpContextX86 context_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpContextX86Writer); -}; - -//! \brief The writer for a MinidumpContextAMD64 structure in a minidump file. -class MinidumpContextAMD64Writer final : public MinidumpContextWriter { - public: - MinidumpContextAMD64Writer(); - ~MinidumpContextAMD64Writer() override; - - // Ensure proper alignment of heap-allocated objects. This should not be - // necessary in C++17. - static void* operator new(size_t size); - static void operator delete(void* ptr); - - // Prevent unaligned heap-allocated arrays. Provisions could be made to allow - // these if necessary, but there is currently no use for them. - static void* operator new[](size_t size) = delete; - static void operator delete[](void* ptr) = delete; - - //! \brief Initializes the MinidumpContextAMD64 based on \a context_snapshot. - //! - //! \param[in] context_snapshot The context snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutation of context() may be done before - //! calling this method, and it is not normally necessary to alter - //! context() after calling this method. - void InitializeFromSnapshot(const CPUContextX86_64* context_snapshot); - - //! \brief Returns a pointer to the context structure that this object will - //! write. - //! - //! \attention This returns a non-`const` pointer to this object’s private - //! data so that a caller can populate the context structure directly. - //! This is done because providing setter interfaces to each field in the - //! context structure would be unwieldy and cumbersome. Care must be taken - //! to populate the context structure correctly. The context structure - //! must only be modified while this object is in the #kStateMutable - //! state. - MinidumpContextAMD64* context() { return &context_; } - - protected: - // MinidumpWritable: - size_t Alignment() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpContextWriter: - size_t ContextSize() const override; - - private: - MinidumpContextAMD64 context_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpContextAMD64Writer); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h b/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h deleted file mode 100644 index 4624b24d23..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_crashpad_info_writer.h +++ /dev/null @@ -1,114 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ - -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_stream_writer.h" -#include "util/misc/uuid.h" - -namespace crashpad { - -class MinidumpModuleCrashpadInfoListWriter; -class MinidumpSimpleStringDictionaryWriter; -class ProcessSnapshot; - -//! \brief The writer for a MinidumpCrashpadInfo stream in a minidump file. -class MinidumpCrashpadInfoWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpCrashpadInfoWriter(); - ~MinidumpCrashpadInfoWriter() override; - - //! \brief Initializes MinidumpCrashpadInfo based on \a process_snapshot. - //! - //! This method may add additional structures to the minidump file as children - //! of the MinidumpCrashpadInfo stream. To do so, it may obtain other - //! snapshot information from \a process_snapshot, such as a list of - //! ModuleSnapshot objects used to initialize - //! MinidumpCrashpadInfo::module_list. Only data that is considered useful - //! will be included. For module information, usefulness is determined by - //! MinidumpModuleCrashpadInfoListWriter::IsUseful(). - //! - //! \param[in] process_snapshot The process snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot); - - //! \brief Sets MinidumpCrashpadInfo::report_id. - void SetReportID(const UUID& report_id); - - //! \brief Sets MinidumpCrashpadInfo::client_id. - void SetClientID(const UUID& client_id); - - //! \brief Arranges for MinidumpCrashpadInfo::simple_annotations to point to - //! the MinidumpSimpleStringDictionaryWriter object to be written by \a - //! simple_annotations. - //! - //! This object takes ownership of \a simple_annotations and becomes its - //! parent in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetSimpleAnnotations( - std::unique_ptr simple_annotations); - - //! \brief Arranges for MinidumpCrashpadInfo::module_list to point to the - //! MinidumpModuleCrashpadInfoList object to be written by \a - //! module_list. - //! - //! This object takes ownership of \a module_list and becomes its parent in - //! the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetModuleList( - std::unique_ptr module_list); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying children would be - //! considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - MinidumpCrashpadInfo crashpad_info_; - std::unique_ptr simple_annotations_; - std::unique_ptr module_list_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpCrashpadInfoWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_exception_writer.h b/Tools/Crashpad/include/minidump/minidump_exception_writer.h deleted file mode 100644 index cc8c6bef04..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_exception_writer.h +++ /dev/null @@ -1,126 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_ - -#include -#include -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_thread_id_map.h" - -namespace crashpad { - -class ExceptionSnapshot; -class MinidumpContextWriter; -class MinidumpMemoryListWriter; - -//! \brief The writer for a MINIDUMP_EXCEPTION_STREAM stream in a minidump file. -class MinidumpExceptionWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpExceptionWriter(); - ~MinidumpExceptionWriter() override; - - //! \brief Initializes the MINIDUMP_EXCEPTION_STREAM based on \a - //! exception_snapshot. - //! - //! \param[in] exception_snapshot The exception snapshot to use as source - //! data. - //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to - //! determine the 32-bit minidump thread ID to use for the thread - //! identified by \a exception_snapshot. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ExceptionSnapshot* exception_snapshot, - const MinidumpThreadIDMap& thread_id_map); - - //! \brief Arranges for MINIDUMP_EXCEPTION_STREAM::ThreadContext to point to - //! the CPU context to be written by \a context. - //! - //! A context is required in all MINIDUMP_EXCEPTION_STREAM objects. - //! - //! This object takes ownership of \a context and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetContext(std::unique_ptr context); - - //! \brief Sets MINIDUMP_EXCEPTION_STREAM::ThreadId. - void SetThreadID(uint32_t thread_id) { exception_.ThreadId = thread_id; } - - //! \brief Sets MINIDUMP_EXCEPTION::ExceptionCode. - void SetExceptionCode(uint32_t exception_code) { - exception_.ExceptionRecord.ExceptionCode = exception_code; - } - - //! \brief Sets MINIDUMP_EXCEPTION::ExceptionFlags. - void SetExceptionFlags(uint32_t exception_flags) { - exception_.ExceptionRecord.ExceptionFlags = exception_flags; - } - - //! \brief Sets MINIDUMP_EXCEPTION::ExceptionRecord. - void SetExceptionRecord(uint64_t exception_record) { - exception_.ExceptionRecord.ExceptionRecord = exception_record; - } - - //! \brief Sets MINIDUMP_EXCEPTION::ExceptionAddress. - void SetExceptionAddress(uint64_t exception_address) { - exception_.ExceptionRecord.ExceptionAddress = exception_address; - } - - //! \brief Sets MINIDUMP_EXCEPTION::ExceptionInformation and - //! MINIDUMP_EXCEPTION::NumberParameters. - //! - //! MINIDUMP_EXCEPTION::NumberParameters is set to the number of elements in - //! \a exception_information. The elements of - //! MINIDUMP_EXCEPTION::ExceptionInformation are set to the elements of \a - //! exception_information. Unused elements in - //! MINIDUMP_EXCEPTION::ExceptionInformation are set to `0`. - //! - //! \a exception_information must have no more than - //! #EXCEPTION_MAXIMUM_PARAMETERS elements. - //! - //! \note Valid in #kStateMutable. - void SetExceptionInformation( - const std::vector& exception_information); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - MINIDUMP_EXCEPTION_STREAM exception_; - std::unique_ptr context_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpExceptionWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_EXCEPTION_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_extensions.h b/Tools/Crashpad/include/minidump/minidump_extensions.h deleted file mode 100644 index 4ddab3bfee..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_extensions.h +++ /dev/null @@ -1,497 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_ - -#include -#include -#include -#include - -#include "base/compiler_specific.h" -#include "build/build_config.h" -#include "util/misc/pdb_structures.h" -#include "util/misc/uuid.h" - -// C4200 is "nonstandard extension used : zero-sized array in struct/union". -// We would like to globally disable this warning, but unfortunately, the -// compiler is buggy and only supports disabling it with a pragma, so we can't -// disable it with other silly warnings in build/common.gypi. See: -// https://connect.microsoft.com/VisualStudio/feedback/details/1114440 -MSVC_PUSH_DISABLE_WARNING(4200); - -#if defined(COMPILER_MSVC) -#define PACKED -#pragma pack(push, 1) -#else -#define PACKED __attribute__((packed)) -#endif // COMPILER_MSVC - -namespace crashpad { - -//! \brief Minidump stream type values for MINIDUMP_DIRECTORY::StreamType. Each -//! stream structure has a corresponding stream type value to identify it. -//! -//! \sa MINIDUMP_STREAM_TYPE -enum MinidumpStreamType : uint32_t { - //! \brief The stream type for MINIDUMP_THREAD_LIST. - //! - //! \sa ThreadListStream - kMinidumpStreamTypeThreadList = ThreadListStream, - - //! \brief The stream type for MINIDUMP_MODULE_LIST. - //! - //! \sa ModuleListStream - kMinidumpStreamTypeModuleList = ModuleListStream, - - //! \brief The stream type for MINIDUMP_MEMORY_LIST. - //! - //! \sa MemoryListStream - kMinidumpStreamTypeMemoryList = MemoryListStream, - - //! \brief The stream type for MINIDUMP_EXCEPTION_STREAM. - //! - //! \sa ExceptionStream - kMinidumpStreamTypeException = ExceptionStream, - - //! \brief The stream type for MINIDUMP_SYSTEM_INFO. - //! - //! \sa SystemInfoStream - kMinidumpStreamTypeSystemInfo = SystemInfoStream, - - //! \brief The stream type for MINIDUMP_HANDLE_DATA_STREAM. - //! - //! \sa HandleDataStream - kMinidumpStreamTypeHandleData = HandleDataStream, - - //! \brief The stream type for MINIDUMP_UNLOADED_MODULE_LIST. - //! - //! \sa UnloadedModuleListStream - kMinidumpStreamTypeUnloadedModuleList = UnloadedModuleListStream, - - //! \brief The stream type for MINIDUMP_MISC_INFO, MINIDUMP_MISC_INFO_2, - //! MINIDUMP_MISC_INFO_3, and MINIDUMP_MISC_INFO_4. - //! - //! \sa MiscInfoStream - kMinidumpStreamTypeMiscInfo = MiscInfoStream, - - //! \brief The stream type for MINIDUMP_MEMORY_INFO_LIST. - //! - //! \sa MemoryInfoListStream - kMinidumpStreamTypeMemoryInfoList = MemoryInfoListStream, - - // 0x4350 = "CP" - - //! \brief The stream type for MinidumpCrashpadInfo. - kMinidumpStreamTypeCrashpadInfo = 0x43500001, -}; - -//! \brief A variable-length UTF-8-encoded string carried within a minidump -//! file. -//! -//! \sa MINIDUMP_STRING -struct ALIGNAS(4) PACKED MinidumpUTF8String { - // The field names do not conform to typical style, they match the names used - // in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for - // UTF-16 strings) and MinidumpUTF8String using templates. - - //! \brief The length of the #Buffer field in bytes, not including the `NUL` - //! terminator. - //! - //! \note This field is interpreted as a byte count, not a count of Unicode - //! code points. - uint32_t Length; - - //! \brief The string, encoded in UTF-8, and terminated with a `NUL` byte. - uint8_t Buffer[0]; -}; - -//! \brief A variable-length array of bytes carried within a minidump file. -//! The data have no intrinsic type and should be interpreted according -//! to their referencing context. -struct ALIGNAS(4) PACKED MinidumpByteArray { - //! \brief The length of the #data field. - uint32_t length; - - //! \brief The bytes of data. - uint8_t data[0]; -}; - -//! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. -//! -//! \sa \ref PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*" -enum MinidumpCPUArchitecture : uint16_t { - //! \brief 32-bit x86. - //! - //! These systems identify their CPUs generically as “x86” or “ia32”, or with - //! more specific names such as “i386”, “i486”, “i586”, and “i686”. - kMinidumpCPUArchitectureX86 = PROCESSOR_ARCHITECTURE_INTEL, - - kMinidumpCPUArchitectureMIPS = PROCESSOR_ARCHITECTURE_MIPS, - kMinidumpCPUArchitectureAlpha = PROCESSOR_ARCHITECTURE_ALPHA, - - //! \brief 32-bit PowerPC. - //! - //! These systems identify their CPUs generically as “ppc”, or with more - //! specific names such as “ppc6xx”, “ppc7xx”, and “ppc74xx”. - kMinidumpCPUArchitecturePPC = PROCESSOR_ARCHITECTURE_PPC, - - kMinidumpCPUArchitectureSHx = PROCESSOR_ARCHITECTURE_SHX, - - //! \brief 32-bit ARM. - //! - //! These systems identify their CPUs generically as “arm”, or with more - //! specific names such as “armv6” and “armv7”. - kMinidumpCPUArchitectureARM = PROCESSOR_ARCHITECTURE_ARM, - - kMinidumpCPUArchitectureIA64 = PROCESSOR_ARCHITECTURE_IA64, - kMinidumpCPUArchitectureAlpha64 = PROCESSOR_ARCHITECTURE_ALPHA64, - kMinidumpCPUArchitectureMSIL = PROCESSOR_ARCHITECTURE_MSIL, - - //! \brief 64-bit x86. - //! - //! These systems identify their CPUs as “x86_64”, “amd64”, or “x64”. - kMinidumpCPUArchitectureAMD64 = PROCESSOR_ARCHITECTURE_AMD64, - - //! \brief A 32-bit x86 process running on IA-64 (Itanium). - //! - //! \note This value is not used in minidump files for 32-bit x86 processes - //! running on a 64-bit-capable x86 CPU and operating system. In that - //! configuration, #kMinidumpCPUArchitectureX86 is used instead. - kMinidumpCPUArchitectureX86Win64 = PROCESSOR_ARCHITECTURE_IA32_ON_WIN64, - - kMinidumpCPUArchitectureNeutral = PROCESSOR_ARCHITECTURE_NEUTRAL, - - //! \brief 64-bit ARM. - //! - //! These systems identify their CPUs generically as “arm64” or “aarch64”, or - //! with more specific names such as “armv8”. - //! - //! \sa #kMinidumpCPUArchitectureARM64Breakpad - kMinidumpCPUArchitectureARM64 = PROCESSOR_ARCHITECTURE_ARM64, - - kMinidumpCPUArchitectureARM32Win64 = PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64, - kMinidumpCPUArchitectureSPARC = 0x8001, - - //! \brief 64-bit PowerPC. - //! - //! These systems identify their CPUs generically as “ppc64”, or with more - //! specific names such as “ppc970”. - kMinidumpCPUArchitecturePPC64 = 0x8002, - - //! \brief Used by Breakpad for 64-bit ARM. - //! - //! \deprecated Use #kMinidumpCPUArchitectureARM64 instead. - kMinidumpCPUArchitectureARM64Breakpad = 0x8003, - - //! \brief Unknown CPU architecture. - kMinidumpCPUArchitectureUnknown = PROCESSOR_ARCHITECTURE_UNKNOWN, -}; - -//! \brief Operating system type values for MINIDUMP_SYSTEM_INFO::ProductType. -//! -//! \sa \ref VER_NT_x "VER_NT_*" -enum MinidumpOSType : uint8_t { - //! \brief A “desktop” or “workstation” system. - kMinidumpOSTypeWorkstation = VER_NT_WORKSTATION, - - //! \brief A “domain controller” system. Windows-specific. - kMinidumpOSTypeDomainController = VER_NT_DOMAIN_CONTROLLER, - - //! \brief A “server” system. - kMinidumpOSTypeServer = VER_NT_SERVER, -}; - -//! \brief Operating system family values for MINIDUMP_SYSTEM_INFO::PlatformId. -//! -//! \sa \ref VER_PLATFORM_x "VER_PLATFORM_*" -enum MinidumpOS : uint32_t { - //! \brief Windows 3.1. - kMinidumpOSWin32s = VER_PLATFORM_WIN32s, - - //! \brief Windows 95, Windows 98, and Windows Me. - kMinidumpOSWin32Windows = VER_PLATFORM_WIN32_WINDOWS, - - //! \brief Windows NT, Windows 2000, and later. - kMinidumpOSWin32NT = VER_PLATFORM_WIN32_NT, - - kMinidumpOSUnix = 0x8000, - - //! \brief macOS, Darwin for traditional systems. - kMinidumpOSMacOSX = 0x8101, - - //! \brief iOS, Darwin for mobile devices. - kMinidumpOSiOS = 0x8102, - - //! \brief Linux, not including Android. - kMinidumpOSLinux = 0x8201, - - kMinidumpOSSolaris = 0x8202, - - //! \brief Android. - kMinidumpOSAndroid = 0x8203, - - kMinidumpOSLegacy = 0x8204, - - //! \brief Native Client (NaCl). - kMinidumpOSNaCl = 0x8205, - - //! \brief Unknown operating system. - kMinidumpOSUnknown = 0xffffffff, -}; - - -//! \brief A list of ::RVA pointers. -struct ALIGNAS(4) PACKED MinidumpRVAList { - //! \brief The number of children present in the #children array. - uint32_t count; - - //! \brief Pointers to other structures in the minidump file. - RVA children[0]; -}; - -//! \brief A key-value pair. -struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry { - //! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value - //! pair. - RVA key; - - //! \brief ::RVA of a MinidumpUTF8String containing the value of a key-value - //! pair. - RVA value; -}; - -//! \brief A list of key-value pairs. -struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary { - //! \brief The number of key-value pairs present. - uint32_t count; - - //! \brief A list of MinidumpSimpleStringDictionaryEntry entries. - MinidumpSimpleStringDictionaryEntry entries[0]; -}; - -//! \brief A typed annotation object. -struct ALIGNAS(4) PACKED MinidumpAnnotation { - //! \brief ::RVA of a MinidumpUTF8String containing the name of the - //! annotation. - RVA name; - - //! \brief The type of data stored in the \a value of the annotation. This - //! may correspond to an \a Annotation::Type or it may be user-defined. - uint16_t type; - - //! \brief This field is always `0`. - uint16_t reserved; - - //! \brief ::RVA of a MinidumpByteArray to the data for the annotation. - RVA value; -}; - -//! \brief A list of annotation objects. -struct ALIGNAS(4) PACKED MinidumpAnnotationList { - //! \brief The number of annotation objects present. - uint32_t count; - - //! \brief A list of MinidumpAnnotation objects. - MinidumpAnnotation objects[0]; -}; - -//! \brief Additional Crashpad-specific information about a module carried -//! within a minidump file. -//! -//! This structure augments the information provided by MINIDUMP_MODULE. The -//! minidump file must contain a module list stream -//! (::kMinidumpStreamTypeModuleList) in order for this structure to appear. -//! -//! This structure is versioned. When changing this structure, leave the -//! existing structure intact so that earlier parsers will be able to understand -//! the fields they are aware of, and make additions at the end of the -//! structure. Revise #kVersion and document each field’s validity based on -//! #version, so that newer parsers will be able to determine whether the added -//! fields are valid or not. -//! -//! \sa MinidumpModuleCrashpadInfoList -struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo { - //! \brief The structure’s currently-defined version number. - //! - //! \sa version - static constexpr uint32_t kVersion = 1; - - //! \brief The structure’s version number. - //! - //! Readers can use this field to determine which other fields in the - //! structure are valid. Upon encountering a value greater than #kVersion, a - //! reader should assume that the structure’s layout is compatible with the - //! structure defined as having value #kVersion. - //! - //! Writers may produce values less than #kVersion in this field if there is - //! no need for any fields present in later versions. - uint32_t version; - - //! \brief A MinidumpRVAList pointing to MinidumpUTF8String objects. The - //! module controls the data that appears here. - //! - //! These strings correspond to ModuleSnapshot::AnnotationsVector() and do not - //! duplicate anything in #simple_annotations or #annotation_objects. - //! - //! This field is present when #version is at least `1`. - MINIDUMP_LOCATION_DESCRIPTOR list_annotations; - - //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as - //! key-value pairs. The module controls the data that appears here. - //! - //! These key-value pairs correspond to - //! ModuleSnapshot::AnnotationsSimpleMap() and do not duplicate anything in - //! #list_annotations or #annotation_objects. - //! - //! This field is present when #version is at least `1`. - MINIDUMP_LOCATION_DESCRIPTOR simple_annotations; - - //! \brief A MinidumpAnnotationList object containing the annotation objects - //! stored within the module. The module controls the data that appears - //! here. - //! - //! These key-value pairs correspond to ModuleSnapshot::AnnotationObjects() - //! and do not duplicate anything in #list_annotations or #simple_annotations. - //! - //! This field may be present when #version is at least `1`. - MINIDUMP_LOCATION_DESCRIPTOR annotation_objects; -}; - -//! \brief A link between a MINIDUMP_MODULE structure and additional -//! Crashpad-specific information about a module carried within a minidump -//! file. -struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink { - //! \brief A link to a MINIDUMP_MODULE structure in the module list stream. - //! - //! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s - //! value must be in the range of MINIDUMP_MODULE_LIST::NumberOfEntries. - uint32_t minidump_module_list_index; - - //! \brief A link to a MinidumpModuleCrashpadInfo structure. - //! - //! MinidumpModuleCrashpadInfo structures are accessed indirectly through - //! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the - //! MinidumpModuleCrashpadInfo structure. - MINIDUMP_LOCATION_DESCRIPTOR location; -}; - -//! \brief Additional Crashpad-specific information about modules carried within -//! a minidump file. -//! -//! This structure augments the information provided by -//! MINIDUMP_MODULE_LIST. The minidump file must contain a module list stream -//! (::kMinidumpStreamTypeModuleList) in order for this structure to appear. -//! -//! MinidumpModuleCrashpadInfoList::count may be less than the value of -//! MINIDUMP_MODULE_LIST::NumberOfModules because not every MINIDUMP_MODULE -//! structure carried within the minidump file will necessarily have -//! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo -//! structure. -struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList { - //! \brief The number of children present in the #modules array. - uint32_t count; - - //! \brief Crashpad-specific information about modules, along with links to - //! MINIDUMP_MODULE structures that contain module information - //! traditionally carried within minidump files. - MinidumpModuleCrashpadInfoLink modules[0]; -}; - -//! \brief Additional Crashpad-specific information carried within a minidump -//! file. -//! -//! This structure is versioned. When changing this structure, leave the -//! existing structure intact so that earlier parsers will be able to understand -//! the fields they are aware of, and make additions at the end of the -//! structure. Revise #kVersion and document each field’s validity based on -//! #version, so that newer parsers will be able to determine whether the added -//! fields are valid or not. -struct ALIGNAS(4) PACKED MinidumpCrashpadInfo { - // UUID has a constructor, which makes it non-POD, which makes this structure - // non-POD. In order for the default constructor to zero-initialize other - // members, an explicit constructor must be provided. - MinidumpCrashpadInfo() - : version(), - report_id(), - client_id(), - simple_annotations(), - module_list() { - } - - //! \brief The structure’s currently-defined version number. - //! - //! \sa version - static constexpr uint32_t kVersion = 1; - - //! \brief The structure’s version number. - //! - //! Readers can use this field to determine which other fields in the - //! structure are valid. Upon encountering a value greater than #kVersion, a - //! reader should assume that the structure’s layout is compatible with the - //! structure defined as having value #kVersion. - //! - //! Writers may produce values less than #kVersion in this field if there is - //! no need for any fields present in later versions. - uint32_t version; - - //! \brief A %UUID identifying an individual crash report. - //! - //! This provides a stable identifier for a crash even as the report is - //! converted to different formats, provided that all formats support storing - //! a crash report ID. - //! - //! If no identifier is available, this field will contain zeroes. - //! - //! This field is present when #version is at least `1`. - UUID report_id; - - //! \brief A %UUID identifying the client that crashed. - //! - //! Client identification is within the scope of the application, but it is - //! expected that the identifier will be unique for an instance of Crashpad - //! monitoring an application or set of applications for a user. The - //! identifier shall remain stable over time. - //! - //! If no identifier is available, this field will contain zeroes. - //! - //! This field is present when #version is at least `1`. - UUID client_id; - - //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as - //! key-value pairs. - //! - //! These key-value pairs correspond to - //! ProcessSnapshot::AnnotationsSimpleMap(). - //! - //! This field is present when #version is at least `1`. - MINIDUMP_LOCATION_DESCRIPTOR simple_annotations; - - //! \brief A pointer to a MinidumpModuleCrashpadInfoList structure. - //! - //! This field is present when #version is at least `1`. - MINIDUMP_LOCATION_DESCRIPTOR module_list; -}; - -#if defined(COMPILER_MSVC) -#pragma pack(pop) -#endif // COMPILER_MSVC -#undef PACKED - -MSVC_POP_WARNING(); // C4200 - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_file_writer.h b/Tools/Crashpad/include/minidump/minidump_file_writer.h deleted file mode 100644 index ce2f1d75a5..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_file_writer.h +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_FILE_WRITER_H_ - -#include -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" -#include "util/file/file_io.h" - -namespace crashpad { - -class ProcessSnapshot; -class MinidumpUserExtensionStreamDataSource; - -//! \brief The root-level object in a minidump file. -//! -//! This object writes a MINIDUMP_HEADER and list of MINIDUMP_DIRECTORY entries -//! to a minidump file. -class MinidumpFileWriter final : public internal::MinidumpWritable { - public: - MinidumpFileWriter(); - ~MinidumpFileWriter() override; - - //! \brief Initializes the MinidumpFileWriter and populates it with - //! appropriate child streams based on \a process_snapshot. - //! - //! This method will add additional streams to the minidump file as children - //! of the MinidumpFileWriter object and as pointees of the top-level - //! MINIDUMP_DIRECTORY. To do so, it will obtain other snapshot information - //! from \a process_snapshot, such as a SystemSnapshot, lists of - //! ThreadSnapshot and ModuleSnapshot objects, and, if available, an - //! ExceptionSnapshot. - //! - //! The streams are added in the order that they are expected to be most - //! useful to minidump readers, to improve data locality and minimize seeking. - //! The streams are added in this order: - //! - kMinidumpStreamTypeSystemInfo - //! - kMinidumpStreamTypeMiscInfo - //! - kMinidumpStreamTypeThreadList - //! - kMinidumpStreamTypeException (if present) - //! - kMinidumpStreamTypeModuleList - //! - kMinidumpStreamTypeUnloadedModuleList (if present) - //! - kMinidumpStreamTypeCrashpadInfo (if present) - //! - kMinidumpStreamTypeMemoryInfoList (if present) - //! - kMinidumpStreamTypeHandleData (if present) - //! - User streams (if present) - //! - kMinidumpStreamTypeMemoryList - //! - //! \param[in] process_snapshot The process snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot); - - //! \brief Sets MINIDUMP_HEADER::Timestamp. - //! - //! \note Valid in #kStateMutable. - void SetTimestamp(time_t timestamp); - - //! \brief Adds a stream to the minidump file and arranges for a - //! MINIDUMP_DIRECTORY entry to point to it. - //! - //! This object takes ownership of \a stream and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! At most one object of each stream type (as obtained from - //! internal::MinidumpStreamWriter::StreamType()) may be added to a - //! MinidumpFileWriter object. If an attempt is made to add a stream whose - //! type matches an existing stream’s type, this method discards the new - //! stream. - //! - //! \note Valid in #kStateMutable. - //! - //! \return `true` on success. `false` on failure, as occurs when an attempt - //! is made to add a stream whose type matches an existing stream’s type, - //! with a message logged. - bool AddStream(std::unique_ptr stream); - - //! \brief Adds a user extension stream to the minidump file and arranges for - //! a MINIDUMP_DIRECTORY entry to point to it. - //! - //! This object takes ownership of \a user_extension_stream_data. - //! - //! At most one object of each stream type (as obtained from - //! internal::MinidumpStreamWriter::StreamType()) may be added to a - //! MinidumpFileWriter object. If an attempt is made to add a stream whose - //! type matches an existing stream’s type, this method discards the new - //! stream. - //! - //! \param[in] user_extension_stream_data The stream data to add to the - //! minidump file. Note that the buffer this object points to must be valid - //! through WriteEverything(). - //! - //! \note Valid in #kStateMutable. - //! - //! \return `true` on success. `false` on failure, as occurs when an attempt - //! is made to add a stream whose type matches an existing stream’s type, - //! with a message logged. - bool AddUserExtensionStream( - std::unique_ptr - user_extension_stream_data); - - // MinidumpWritable: - - //! \copydoc internal::MinidumpWritable::WriteEverything() - //! - //! This method does not initially write the final value for - //! MINIDUMP_HEADER::Signature. After all child objects have been written, it - //! rewinds to the beginning of the file and writes the correct value for this - //! field. This prevents incompletely-written minidump files from being - //! mistaken for valid ones. - bool WriteEverything(FileWriterInterface* file_writer) override; - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WillWriteAtOffsetImpl(FileOffset offset) override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MINIDUMP_HEADER header_; - std::vector> streams_; - - // Protects against multiple streams with the same ID being added. - std::set stream_types_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpFileWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_handle_writer.h b/Tools/Crashpad/include/minidump/minidump_handle_writer.h deleted file mode 100644 index f8eaeef941..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_handle_writer.h +++ /dev/null @@ -1,77 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_ - -#include -#include -#include - -#include -#include -#include - -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_string_writer.h" -#include "minidump/minidump_writable.h" -#include "snapshot/handle_snapshot.h" - -namespace crashpad { - -//! \brief The writer for a MINIDUMP_HANDLE_DATA_STREAM stream in a minidump -//! and its contained MINIDUMP_HANDLE_DESCRIPTOR s. -//! -//! As we currently do not track any data beyond what MINIDUMP_HANDLE_DESCRIPTOR -//! supports, we only write that type of record rather than the newer -//! MINIDUMP_HANDLE_DESCRIPTOR_2. -//! -//! Note that this writer writes both the header (MINIDUMP_HANDLE_DATA_STREAM) -//! and the list of objects (MINIDUMP_HANDLE_DESCRIPTOR), which is different -//! from some of the other list writers. -class MinidumpHandleDataWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpHandleDataWriter(); - ~MinidumpHandleDataWriter() override; - - //! \brief Adds a MINIDUMP_HANDLE_DESCRIPTOR for each handle in \a - //! handle_snapshot to the MINIDUMP_HANDLE_DATA_STREAM. - //! - //! \param[in] handle_snapshots The handle snapshots to use as source data. - //! - //! \note Valid in #kStateMutable. - void InitializeFromSnapshot( - const std::vector& handle_snapshots); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - MINIDUMP_HANDLE_DATA_STREAM handle_data_stream_base_; - std::vector handle_descriptors_; - std::map strings_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpHandleDataWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_HANDLE_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h b/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h deleted file mode 100644 index ec66019703..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_memory_info_writer.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2015 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_ - -#include -#include -#include -#include - -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class MemoryMapRegionSnapshot; -class MinidumpContextWriter; -class MinidumpMemoryListWriter; -class MinidumpMemoryWriter; - -//! \brief The writer for a MINIDUMP_MEMORY_INFO_LIST stream in a minidump file, -//! containing a list of MINIDUMP_MEMORY_INFO objects. -class MinidumpMemoryInfoListWriter final - : public internal::MinidumpStreamWriter { - public: - MinidumpMemoryInfoListWriter(); - ~MinidumpMemoryInfoListWriter() override; - - //! \brief Initializes a MINIDUMP_MEMORY_INFO_LIST based on \a memory_map. - //! - //! \param[in] memory_map The vector of memory map region snapshots to use as - //! source data. - //! - //! \note Valid in #kStateMutable. - void InitializeFromSnapshot( - const std::vector& memory_map); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - MINIDUMP_MEMORY_INFO_LIST memory_info_list_base_; - std::vector items_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryInfoListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_INFO_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_memory_writer.h b/Tools/Crashpad/include/minidump/minidump_memory_writer.h deleted file mode 100644 index 955209076c..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_memory_writer.h +++ /dev/null @@ -1,172 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_ - -#include -#include -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" -#include "snapshot/memory_snapshot.h" -#include "util/file/file_io.h" - -namespace crashpad { - -//! \brief The base class for writers of memory ranges pointed to by -//! MINIDUMP_MEMORY_DESCRIPTOR objects in a minidump file. -class SnapshotMinidumpMemoryWriter : public internal::MinidumpWritable, - public MemorySnapshot::Delegate { - public: - explicit SnapshotMinidumpMemoryWriter(const MemorySnapshot* memory_snapshot); - ~SnapshotMinidumpMemoryWriter() override; - - //! \brief Returns a MINIDUMP_MEMORY_DESCRIPTOR referencing the data that this - //! object writes. - //! - //! This method is expected to be called by a MinidumpMemoryListWriter in - //! order to obtain a MINIDUMP_MEMORY_DESCRIPTOR to include in its list. - //! - //! \note Valid in #kStateWritable. - const MINIDUMP_MEMORY_DESCRIPTOR* MinidumpMemoryDescriptor() const; - - //! \brief Registers a memory descriptor as one that should point to the - //! object on which this method is called. - //! - //! This method is expected to be called by objects of other classes, when - //! those other classes have their own memory descriptors that need to point - //! to memory ranges within a minidump file. MinidumpThreadWriter is one such - //! class. This method is public for this reason, otherwise it would suffice - //! to be private. - //! - //! \note Valid in #kStateFrozen or any preceding state. - void RegisterMemoryDescriptor(MINIDUMP_MEMORY_DESCRIPTOR* memory_descriptor); - - private: - // MemorySnapshot::Delegate: - bool MemorySnapshotDelegateRead(void* data, size_t size) override; - - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() final; - bool WriteObject(FileWriterInterface* file_writer) override; - - //! \brief Returns the object’s desired byte-boundary alignment. - //! - //! Memory regions are aligned to a 16-byte boundary. The actual alignment - //! requirements of any data within the memory region are unknown, and may be - //! more or less strict than this depending on the platform. - //! - //! \return `16`. - //! - //! \note Valid in #kStateFrozen or any subsequent state. - size_t Alignment() override; - - bool WillWriteAtOffsetImpl(FileOffset offset) override; - - //! \brief Returns the object’s desired write phase. - //! - //! Memory regions are written at the end of minidump files, because it is - //! expected that unlike most other data in a minidump file, the contents of - //! memory regions will be accessed sparsely. - //! - //! \return #kPhaseLate. - //! - //! \note Valid in any state. - Phase WritePhase() final; - - //! \brief Gets the underlying memory snapshot that the memory writer will - //! write to the minidump. - const MemorySnapshot& UnderlyingSnapshot() const { return *memory_snapshot_; } - - MINIDUMP_MEMORY_DESCRIPTOR memory_descriptor_; - - // weak - std::vector registered_memory_descriptors_; - const MemorySnapshot* memory_snapshot_; - FileWriterInterface* file_writer_; - - DISALLOW_COPY_AND_ASSIGN(SnapshotMinidumpMemoryWriter); -}; - -//! \brief The writer for a MINIDUMP_MEMORY_LIST stream in a minidump file, -//! containing a list of MINIDUMP_MEMORY_DESCRIPTOR objects. -class MinidumpMemoryListWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpMemoryListWriter(); - ~MinidumpMemoryListWriter() override; - - //! \brief Adds a concrete initialized SnapshotMinidumpMemoryWriter for each - //! memory snapshot in \a memory_snapshots to the MINIDUMP_MEMORY_LIST. - //! - //! Memory snapshots are added in the fashion of AddMemory(). - //! - //! \param[in] memory_snapshots The memory snapshots to use as source data. - //! - //! \note Valid in #kStateMutable. - void AddFromSnapshot( - const std::vector& memory_snapshots); - - //! \brief Adds a SnapshotMinidumpMemoryWriter to the MINIDUMP_MEMORY_LIST. - //! - //! This object takes ownership of \a memory_writer and becomes its parent in - //! the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void AddMemory(std::unique_ptr memory_writer); - - //! \brief Adds a SnapshotMinidumpMemoryWriter that’s a child of another - //! internal::MinidumpWritable object to the MINIDUMP_MEMORY_LIST. - //! - //! \a memory_writer does not become a child of this object, but the - //! MINIDUMP_MEMORY_LIST will still contain a MINIDUMP_MEMORY_DESCRIPTOR for - //! it. \a memory_writer must be a child of another object in the - //! internal::MinidumpWritable tree. - //! - //! This method exists to be called by objects that have their own - //! SnapshotMinidumpMemoryWriter children but wish for them to also appear in - //! the minidump file’s MINIDUMP_MEMORY_LIST. MinidumpThreadWriter, which has - //! a SnapshotMinidumpMemoryWriter for thread stack memory, is an example. - //! - //! \note Valid in #kStateMutable. - void AddExtraMemory(SnapshotMinidumpMemoryWriter* memory_writer); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - std::vector memory_writers_; // weak - std::vector> children_; - MINIDUMP_MEMORY_LIST memory_list_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpMemoryListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_MEMORY_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h b/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h deleted file mode 100644 index ee90b0eac0..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_misc_info_writer.h +++ /dev/null @@ -1,142 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_ - -#include -#include -#include -#include -#include - -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class ProcessSnapshot; - -namespace internal { - -//! \brief Returns the string to set in MINIDUMP_MISC_INFO_4::DbgBldStr. -//! -//! dbghelp produces strings like `"dbghelp.i386,6.3.9600.16520"` and -//! `"dbghelp.amd64,6.3.9600.16520"`. This function mimics that format, and adds -//! the OS that wrote the minidump along with any relevant platform-specific -//! data describing the compilation environment. -//! -//! This function is an implementation detail of -//! MinidumpMiscInfoWriter::InitializeFromSnapshot() and is only exposed for -//! testing purposes. -std::string MinidumpMiscInfoDebugBuildString(); - -} // namespace internal - -//! \brief The writer for a stream in the MINIDUMP_MISC_INFO family in a -//! minidump file. -//! -//! The actual stream written will be a MINIDUMP_MISC_INFO, -//! MINIDUMP_MISC_INFO_2, MINIDUMP_MISC_INFO_3, MINIDUMP_MISC_INFO_4, or -//! MINIDUMP_MISC_INFO_5 stream. Later versions of MINIDUMP_MISC_INFO are -//! supersets of earlier versions. The earliest version that supports all of the -//! information that an object of this class contains will be used. -class MinidumpMiscInfoWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpMiscInfoWriter(); - ~MinidumpMiscInfoWriter() override; - - //! \brief Initializes MINIDUMP_MISC_INFO_N based on \a process_snapshot. - //! - //! \param[in] process_snapshot The process snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ProcessSnapshot* process_snapshot); - - //! \brief Sets the field referenced by #MINIDUMP_MISC1_PROCESS_ID. - void SetProcessID(uint32_t process_id); - - //! \brief Sets the fields referenced by #MINIDUMP_MISC1_PROCESS_TIMES. - void SetProcessTimes(time_t process_create_time, - uint32_t process_user_time, - uint32_t process_kernel_time); - - //! \brief Sets the fields referenced by #MINIDUMP_MISC1_PROCESSOR_POWER_INFO. - void SetProcessorPowerInfo(uint32_t processor_max_mhz, - uint32_t processor_current_mhz, - uint32_t processor_mhz_limit, - uint32_t processor_max_idle_state, - uint32_t processor_current_idle_state); - - //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROCESS_INTEGRITY. - void SetProcessIntegrityLevel(uint32_t process_integrity_level); - - //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS. - void SetProcessExecuteFlags(uint32_t process_execute_flags); - - //! \brief Sets the field referenced by #MINIDUMP_MISC3_PROTECTED_PROCESS. - void SetProtectedProcess(uint32_t protected_process); - - //! \brief Sets the fields referenced by #MINIDUMP_MISC3_TIMEZONE. - void SetTimeZone(uint32_t time_zone_id, - int32_t bias, - const std::string& standard_name, - const SYSTEMTIME& standard_date, - int32_t standard_bias, - const std::string& daylight_name, - const SYSTEMTIME& daylight_date, - int32_t daylight_bias); - - //! \brief Sets the fields referenced by #MINIDUMP_MISC4_BUILDSTRING. - void SetBuildString(const std::string& build_string, - const std::string& debug_build_string); - - // TODO(mark): Provide a better interface than this. Don’t force callers to - // build their own XSTATE_CONFIG_FEATURE_MSC_INFO structure. - // - //! \brief Sets MINIDUMP_MISC_INFO_5::XStateData. - void SetXStateData(const XSTATE_CONFIG_FEATURE_MSC_INFO& xstate_data); - - //! \brief Sets the field referenced by #MINIDUMP_MISC5_PROCESS_COOKIE. - void SetProcessCookie(uint32_t process_cookie); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - bool WriteObject(FileWriterInterface* file_writer) override; - MinidumpStreamType StreamType() const override; - - private: - //! \brief Returns the size of the object to be written based on - //! MINIDUMP_MISC_INFO_N::Flags1. - //! - //! The smallest defined structure type in the MINIDUMP_MISC_INFO family that - //! can hold all of the data that has been populated will be used. - size_t CalculateSizeOfObjectFromFlags() const; - - MINIDUMP_MISC_INFO_N misc_info_; - bool has_xstate_data_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpMiscInfoWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_MISC_INFO_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h b/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h deleted file mode 100644 index 850db04038..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_module_crashpad_info_writer.h +++ /dev/null @@ -1,180 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_ - -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_string_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class MinidumpAnnotationListWriter; -class MinidumpSimpleStringDictionaryWriter; -class ModuleSnapshot; - -//! \brief The writer for a MinidumpModuleCrashpadInfo object in a minidump -//! file. -class MinidumpModuleCrashpadInfoWriter final - : public internal::MinidumpWritable { - public: - MinidumpModuleCrashpadInfoWriter(); - ~MinidumpModuleCrashpadInfoWriter() override; - - //! \brief Initializes MinidumpModuleCrashpadInfo based on \a module_snapshot. - //! - //! Only data in \a module_snapshot that is considered useful will be - //! included. For simple annotations, usefulness is determined by - //! MinidumpSimpleStringDictionaryWriter::IsUseful(). - //! - //! \param[in] module_snapshot The module snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot); - - //! \brief Arranges for MinidumpModuleCrashpadInfo::list_annotations to point - //! to the internal::MinidumpUTF8StringListWriter object to be written by - //! \a list_annotations. - //! - //! This object takes ownership of \a simple_annotations and becomes its - //! parent in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetListAnnotations( - std::unique_ptr list_annotations); - - //! \brief Arranges for MinidumpModuleCrashpadInfo::simple_annotations to - //! point to the MinidumpSimpleStringDictionaryWriter object to be written - //! by \a simple_annotations. - //! - //! This object takes ownership of \a simple_annotations and becomes its - //! parent in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetSimpleAnnotations( - std::unique_ptr simple_annotations); - - //! \brief Arranges for MinidumpModuleCrashpadInfo::annotation_objects to - //! point to the MinidumpAnnotationListWriter object to be written by - //! \a annotation_objects. - //! - //! This object takes ownership of \a annotation_objects and becomes its - //! parent in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetAnnotationObjects( - std::unique_ptr annotation_objects); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying list annotations or - //! simple annotations would be considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MinidumpModuleCrashpadInfo module_; - std::unique_ptr list_annotations_; - std::unique_ptr simple_annotations_; - std::unique_ptr annotation_objects_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCrashpadInfoWriter); -}; - -//! \brief The writer for a MinidumpModuleCrashpadInfoList object in a minidump -//! file, containing a list of MinidumpModuleCrashpadInfo objects. -class MinidumpModuleCrashpadInfoListWriter final - : public internal::MinidumpWritable { - public: - MinidumpModuleCrashpadInfoListWriter(); - ~MinidumpModuleCrashpadInfoListWriter() override; - - //! \brief Adds an initialized MinidumpModuleCrashpadInfo for modules in \a - //! module_snapshots to the MinidumpModuleCrashpadInfoList. - //! - //! Only modules in \a module_snapshots that would produce a useful - //! MinidumpModuleCrashpadInfo structure are included. Usefulness is - //! determined by MinidumpModuleCrashpadInfoWriter::IsUseful(). - //! - //! \param[in] module_snapshots The module snapshots to use as source data. - //! - //! \note Valid in #kStateMutable. AddModule() may not be called before this - //! method, and it is not normally necessary to call AddModule() after - //! this method. - void InitializeFromSnapshot( - const std::vector& module_snapshots); - - //! \brief Adds a MinidumpModuleCrashpadInfo to the - //! MinidumpModuleCrashpadInfoList. - //! - //! \param[in] module_crashpad_info Extended Crashpad-specific information - //! about the module. This object takes ownership of \a - //! module_crashpad_info and becomes its parent in the overall tree of - //! internal::MinidumpWritable objects. - //! \param[in] minidump_module_list_index The index of the MINIDUMP_MODULE in - //! the minidump file’s MINIDUMP_MODULE_LIST stream that corresponds to \a - //! module_crashpad_info. - //! - //! \note Valid in #kStateMutable. - void AddModule( - std::unique_ptr module_crashpad_info, - size_t minidump_module_list_index); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying children would be - //! considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - std::vector> - module_crashpad_infos_; - std::vector module_crashpad_info_links_; - MinidumpModuleCrashpadInfoList module_crashpad_info_list_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCrashpadInfoListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_module_writer.h b/Tools/Crashpad/include/minidump/minidump_module_writer.h deleted file mode 100644 index 555c41157f..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_module_writer.h +++ /dev/null @@ -1,352 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_ - -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "base/strings/string16.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class ModuleSnapshot; - -namespace internal { -class MinidumpUTF16StringWriter; -} // namespace internal - -//! \brief The base class for writers of CodeView records referenced by -//! MINIDUMP_MODULE::CvRecord in minidump files. -class MinidumpModuleCodeViewRecordWriter : public internal::MinidumpWritable { - public: - ~MinidumpModuleCodeViewRecordWriter() override; - - protected: - MinidumpModuleCodeViewRecordWriter() : MinidumpWritable() {} - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordWriter); -}; - -namespace internal { - -//! \brief The base class for writers of CodeView records that serve as links to -//! `.pdb` (program database) files. -template -class MinidumpModuleCodeViewRecordPDBLinkWriter - : public MinidumpModuleCodeViewRecordWriter { - public: - //! \brief Sets the name of the `.pdb` file being linked to. - void SetPDBName(const std::string& pdb_name) { pdb_name_ = pdb_name; } - - protected: - MinidumpModuleCodeViewRecordPDBLinkWriter(); - ~MinidumpModuleCodeViewRecordPDBLinkWriter() override; - - // MinidumpWritable: - size_t SizeOfObject() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - //! \brief Returns a pointer to the raw CodeView record’s data. - //! - //! Subclasses can use this to set fields in their codeview records other than - //! the `pdb_name` field. - CodeViewRecordType* codeview_record() { return &codeview_record_; } - - private: - CodeViewRecordType codeview_record_; - std::string pdb_name_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDBLinkWriter); -}; - -} // namespace internal - -//! \brief The writer for a CodeViewRecordPDB20 object in a minidump file. -//! -//! Most users will want MinidumpModuleCodeViewRecordPDB70Writer instead. -class MinidumpModuleCodeViewRecordPDB20Writer final - : public internal::MinidumpModuleCodeViewRecordPDBLinkWriter< - CodeViewRecordPDB20> { - public: - MinidumpModuleCodeViewRecordPDB20Writer() - : internal::MinidumpModuleCodeViewRecordPDBLinkWriter< - CodeViewRecordPDB20>() {} - - ~MinidumpModuleCodeViewRecordPDB20Writer() override; - - //! \brief Sets CodeViewRecordPDB20::timestamp and CodeViewRecordPDB20::age. - void SetTimestampAndAge(time_t timestamp, uint32_t age); - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDB20Writer); -}; - -//! \brief The writer for a CodeViewRecordPDB70 object in a minidump file. -class MinidumpModuleCodeViewRecordPDB70Writer final - : public internal::MinidumpModuleCodeViewRecordPDBLinkWriter< - CodeViewRecordPDB70> { - public: - MinidumpModuleCodeViewRecordPDB70Writer() - : internal::MinidumpModuleCodeViewRecordPDBLinkWriter< - CodeViewRecordPDB70>() {} - - ~MinidumpModuleCodeViewRecordPDB70Writer() override; - - //! \brief Initializes the CodeViewRecordPDB70 based on \a module_snapshot. - //! - //! \param[in] module_snapshot The module snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot); - - //! \brief Sets CodeViewRecordPDB70::uuid and CodeViewRecordPDB70::age. - void SetUUIDAndAge(const UUID& uuid, uint32_t age) { - codeview_record()->uuid = uuid; - codeview_record()->age = age; - } - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleCodeViewRecordPDB70Writer); -}; - -//! \brief The writer for an IMAGE_DEBUG_MISC object in a minidump file. -//! -//! Most users will want MinidumpModuleCodeViewRecordPDB70Writer instead. -class MinidumpModuleMiscDebugRecordWriter final - : public internal::MinidumpWritable { - public: - MinidumpModuleMiscDebugRecordWriter(); - ~MinidumpModuleMiscDebugRecordWriter() override; - - //! \brief Sets IMAGE_DEBUG_MISC::DataType. - void SetDataType(uint32_t data_type) { - image_debug_misc_.DataType = data_type; - } - - //! \brief Sets IMAGE_DEBUG_MISC::Data, IMAGE_DEBUG_MISC::Length, and - //! IMAGE_DEBUG_MISC::Unicode. - //! - //! If \a utf16 is `true`, \a data will be treated as UTF-8 data and will be - //! converted to UTF-16, and IMAGE_DEBUG_MISC::Unicode will be set to `1`. - //! Otherwise, \a data will be used as-is and IMAGE_DEBUG_MISC::Unicode will - //! be set to `0`. - void SetData(const std::string& data, bool utf16); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - IMAGE_DEBUG_MISC image_debug_misc_; - std::string data_; - base::string16 data_utf16_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleMiscDebugRecordWriter); -}; - -//! \brief The writer for a MINIDUMP_MODULE object in a minidump file. -//! -//! Because MINIDUMP_MODULE objects only appear as elements of -//! MINIDUMP_MODULE_LIST objects, this class does not write any data on its own. -//! It makes its MINIDUMP_MODULE data available to its MinidumpModuleListWriter -//! parent, which writes it as part of a MINIDUMP_MODULE_LIST. -class MinidumpModuleWriter final : public internal::MinidumpWritable { - public: - MinidumpModuleWriter(); - ~MinidumpModuleWriter() override; - - //! \brief Initializes the MINIDUMP_MODULE based on \a module_snapshot. - //! - //! \param[in] module_snapshot The module snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ModuleSnapshot* module_snapshot); - - //! \brief Returns a MINIDUMP_MODULE referencing this object’s data. - //! - //! This method is expected to be called by a MinidumpModuleListWriter in - //! order to obtain a MINIDUMP_MODULE to include in its list. - //! - //! \note Valid in #kStateWritable. - const MINIDUMP_MODULE* MinidumpModule() const; - - //! \brief Arranges for MINIDUMP_MODULE::ModuleNameRva to point to a - //! MINIDUMP_STRING containing \a name. - //! - //! A name is required in all MINIDUMP_MODULE objects. - //! - //! \note Valid in #kStateMutable. - void SetName(const std::string& name); - - //! \brief Arranges for MINIDUMP_MODULE::CvRecord to point to a CodeView - //! record to be written by \a codeview_record. - //! - //! This object takes ownership of \a codeview_record and becomes its parent - //! in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetCodeViewRecord( - std::unique_ptr codeview_record); - - //! \brief Arranges for MINIDUMP_MODULE::MiscRecord to point to an - //! IMAGE_DEBUG_MISC object to be written by \a misc_debug_record. - //! - //! This object takes ownership of \a misc_debug_record and becomes its parent - //! in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetMiscDebugRecord( - std::unique_ptr misc_debug_record); - - //! \brief Sets IMAGE_DEBUG_MISC::BaseOfImage. - void SetImageBaseAddress(uint64_t image_base_address) { - module_.BaseOfImage = image_base_address; - } - - //! \brief Sets IMAGE_DEBUG_MISC::SizeOfImage. - void SetImageSize(uint32_t image_size) { module_.SizeOfImage = image_size; } - - //! \brief Sets IMAGE_DEBUG_MISC::CheckSum. - void SetChecksum(uint32_t checksum) { module_.CheckSum = checksum; } - - //! \brief Sets IMAGE_DEBUG_MISC::TimeDateStamp. - //! - //! \note Valid in #kStateMutable. - void SetTimestamp(time_t timestamp); - - //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileVersionMS - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileVersionMS" and \ref - //! VS_FIXEDFILEINFO::dwFileVersionLS - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileVersionLS". - //! - //! \note Valid in #kStateMutable. - void SetFileVersion(uint16_t version_0, - uint16_t version_1, - uint16_t version_2, - uint16_t version_3); - - //! \brief Sets \ref VS_FIXEDFILEINFO::dwProductVersionMS - //! "IMAGE_DEBUG_MISC::VersionInfo::dwProductVersionMS" and \ref - //! VS_FIXEDFILEINFO::dwProductVersionLS - //! "IMAGE_DEBUG_MISC::VersionInfo::dwProductVersionLS". - //! - //! \note Valid in #kStateMutable. - void SetProductVersion(uint16_t version_0, - uint16_t version_1, - uint16_t version_2, - uint16_t version_3); - - //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileFlags - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileFlags" and \ref - //! VS_FIXEDFILEINFO::dwFileFlagsMask - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileFlagsMask". - //! - //! \note Valid in #kStateMutable. - void SetFileFlagsAndMask(uint32_t file_flags, uint32_t file_flags_mask); - - //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileOS - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileOS". - void SetFileOS(uint32_t file_os) { module_.VersionInfo.dwFileOS = file_os; } - - //! \brief Sets \ref VS_FIXEDFILEINFO::dwFileType - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileType" and \ref - //! VS_FIXEDFILEINFO::dwFileSubtype - //! "IMAGE_DEBUG_MISC::VersionInfo::dwFileSubtype". - void SetFileTypeAndSubtype(uint32_t file_type, uint32_t file_subtype) { - module_.VersionInfo.dwFileType = file_type; - module_.VersionInfo.dwFileSubtype = file_subtype; - } - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MINIDUMP_MODULE module_; - std::unique_ptr name_; - std::unique_ptr codeview_record_; - std::unique_ptr misc_debug_record_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleWriter); -}; - -//! \brief The writer for a MINIDUMP_MODULE_LIST stream in a minidump file, -//! containing a list of MINIDUMP_MODULE objects. -class MinidumpModuleListWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpModuleListWriter(); - ~MinidumpModuleListWriter() override; - - //! \brief Adds an initialized MINIDUMP_MODULE for each module in \a - //! module_snapshots to the MINIDUMP_MODULE_LIST. - //! - //! \param[in] module_snapshots The module snapshots to use as source data. - //! - //! \note Valid in #kStateMutable. AddModule() may not be called before this - //! method, and it is not normally necessary to call AddModule() after - //! this method. - void InitializeFromSnapshot( - const std::vector& module_snapshots); - - //! \brief Adds a MinidumpModuleWriter to the MINIDUMP_MODULE_LIST. - //! - //! This object takes ownership of \a module and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void AddModule(std::unique_ptr module); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - std::vector> modules_; - MINIDUMP_MODULE_LIST module_list_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpModuleListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_MODULE_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h b/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h deleted file mode 100644 index af584f13cc..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_rva_list_writer.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_ -#define CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_ - -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { -namespace internal { - -//! \brief The writer for a MinidumpRVAList object in a minidump file, -//! containing a list of ::RVA pointers. -class MinidumpRVAListWriter : public MinidumpWritable { - protected: - MinidumpRVAListWriter(); - ~MinidumpRVAListWriter() override; - - //! \brief Adds an ::RVA referencing an MinidumpWritable to the - //! MinidumpRVAList. - //! - //! This object takes ownership of \a child and becomes its parent in the - //! overall tree of MinidumpWritable objects. - //! - //! To provide type-correctness, subclasses are expected to provide a public - //! method that accepts a `scoped_ptr`-wrapped argument of the proper - //! MinidumpWritable subclass, and call this method with that argument. - //! - //! \note Valid in #kStateMutable. - void AddChild(std::unique_ptr child); - - //! \brief Returns `true` if no child objects have been added by AddChild(), - //! and `false` if child objects are present. - bool IsEmpty() const { return children_.empty(); } - - //! \brief Returns an object’s ::RVA objects referencing its children. - //! - //! \note The returned vector will be empty until the object advances to - //! #kStateFrozen or beyond. - const std::vector& child_rvas() const { return child_rvas_; } - - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - std::unique_ptr rva_list_base_; - std::vector> children_; - std::vector child_rvas_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpRVAListWriter); -}; - -} // namespace internal -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h b/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h deleted file mode 100644 index f2662bccff..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_simple_string_dictionary_writer.h +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_ - -#include - -#include -#include -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_string_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -//! \brief The writer for a MinidumpSimpleStringDictionaryEntry object in a -//! minidump file. -//! -//! Because MinidumpSimpleStringDictionaryEntry objects only appear as elements -//! of MinidumpSimpleStringDictionary objects, this class does not write any -//! data on its own. It makes its MinidumpSimpleStringDictionaryEntry data -//! available to its MinidumpSimpleStringDictionaryWriter parent, which writes -//! it as part of a MinidumpSimpleStringDictionary. -class MinidumpSimpleStringDictionaryEntryWriter final - : public internal::MinidumpWritable { - public: - MinidumpSimpleStringDictionaryEntryWriter(); - ~MinidumpSimpleStringDictionaryEntryWriter() override; - - //! \brief Returns a MinidumpSimpleStringDictionaryEntry referencing this - //! object’s data. - //! - //! This method is expected to be called by a - //! MinidumpSimpleStringDictionaryWriter in order to obtain a - //! MinidumpSimpleStringDictionaryEntry to include in its list. - //! - //! \note Valid in #kStateWritable. - const MinidumpSimpleStringDictionaryEntry* - GetMinidumpSimpleStringDictionaryEntry() const; - - //! \brief Sets the strings to be written as the entry object’s key and value. - //! - //! \note Valid in #kStateMutable. - void SetKeyValue(const std::string& key, const std::string& value); - - //! \brief Retrieves the key to be written. - //! - //! \note Valid in any state. - const std::string& Key() const { return key_.UTF8(); } - - protected: - // MinidumpWritable: - - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - struct MinidumpSimpleStringDictionaryEntry entry_; - internal::MinidumpUTF8StringWriter key_; - internal::MinidumpUTF8StringWriter value_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpSimpleStringDictionaryEntryWriter); -}; - -//! \brief The writer for a MinidumpSimpleStringDictionary object in a minidump -//! file, containing a list of MinidumpSimpleStringDictionaryEntry objects. -//! -//! Because this class writes a representatin of a dictionary, the order of -//! entries is insignificant. Entries may be written in any order. -class MinidumpSimpleStringDictionaryWriter final - : public internal::MinidumpWritable { - public: - MinidumpSimpleStringDictionaryWriter(); - ~MinidumpSimpleStringDictionaryWriter() override; - - //! \brief Adds an initialized MinidumpSimpleStringDictionaryEntryWriter for - //! each key-value pair in \a map to the MinidumpSimpleStringDictionary. - //! - //! \param[in] map The map to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromMap(const std::map& map); - - //! \brief Adds a MinidumpSimpleStringDictionaryEntryWriter to the - //! MinidumpSimpleStringDictionary. - //! - //! This object takes ownership of \a entry and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! If the key contained in \a entry duplicates the key of an entry already - //! present in the MinidumpSimpleStringDictionary, the new \a entry will - //! replace the previous one. - //! - //! \note Valid in #kStateMutable. - void AddEntry( - std::unique_ptr entry); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying entries would be - //! considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - protected: - // MinidumpWritable: - - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - // This object owns the MinidumpSimpleStringDictionaryEntryWriter objects. - std::map entries_; - - std::unique_ptr - simple_string_dictionary_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpSimpleStringDictionaryWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_stream_writer.h b/Tools/Crashpad/include/minidump/minidump_stream_writer.h deleted file mode 100644 index 894889ae8d..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_stream_writer.h +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_STREAM_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_STREAM_WRITER_H_ - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { -namespace internal { - -//! \brief The base class for all second-level objects (“streams”) in a minidump -//! file. -//! -//! Instances of subclasses of this class are children of the root-level -//! MinidumpFileWriter object. -class MinidumpStreamWriter : public MinidumpWritable { - public: - ~MinidumpStreamWriter() override; - - //! \brief Returns an object’s stream type. - //! - //! \note Valid in any state. - virtual MinidumpStreamType StreamType() const = 0; - - //! \brief Returns a MINIDUMP_DIRECTORY entry that serves as a pointer to this - //! stream. - //! - //! This method is provided for MinidumpFileWriter, which calls it in order to - //! obtain the directory entry for a stream. - //! - //! \note Valid only in #kStateWritable. - const MINIDUMP_DIRECTORY* DirectoryListEntry() const; - - protected: - MinidumpStreamWriter(); - - // MinidumpWritable: - bool Freeze() override; - - private: - MINIDUMP_DIRECTORY directory_list_entry_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpStreamWriter); -}; - -} // namespace internal -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_STREAM_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_string_writer.h b/Tools/Crashpad/include/minidump/minidump_string_writer.h deleted file mode 100644 index 97215da445..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_string_writer.h +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_ - -#include -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "base/strings/string16.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_rva_list_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { -namespace internal { - -//! \cond - -struct MinidumpStringWriterUTF16Traits { - using StringType = base::string16; - using MinidumpStringType = MINIDUMP_STRING; -}; - -struct MinidumpStringWriterUTF8Traits { - using StringType = std::string; - using MinidumpStringType = MinidumpUTF8String; -}; - -//! \endcond - -//! \brief Writes a variable-length string to a minidump file in accordance with -//! the string type’s characteristics. -//! -//! MinidumpStringWriter objects should not be instantiated directly. To write -//! strings to minidump file, use the MinidumpUTF16StringWriter and -//! MinidumpUTF8StringWriter subclasses instead. -template -class MinidumpStringWriter : public MinidumpWritable { - public: - MinidumpStringWriter(); - ~MinidumpStringWriter() override; - - protected: - using MinidumpStringType = typename Traits::MinidumpStringType; - using StringType = typename Traits::StringType; - - bool Freeze() override; - size_t SizeOfObject() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - //! \brief Sets the string to be written. - //! - //! \note Valid in #kStateMutable. - void set_string(const StringType& string) { string_.assign(string); } - - //! \brief Retrieves the string to be written. - //! - //! \note Valid in any state. - const StringType& string() const { return string_; } - - private: - std::unique_ptr string_base_; - StringType string_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpStringWriter); -}; - -//! \brief Writes a variable-length UTF-16-encoded MINIDUMP_STRING to a minidump -//! file. -//! -//! MinidumpUTF16StringWriter objects should not be instantiated directly -//! outside of the MinidumpWritable family of classes. -class MinidumpUTF16StringWriter final - : public MinidumpStringWriter { - public: - MinidumpUTF16StringWriter() : MinidumpStringWriter() {} - ~MinidumpUTF16StringWriter() override; - - //! \brief Converts a UTF-8 string to UTF-16 and sets it as the string to be - //! written. - //! - //! \note Valid in #kStateMutable. - void SetUTF8(const std::string& string_utf8); - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpUTF16StringWriter); -}; - -//! \brief Writes a variable-length UTF-8-encoded MinidumpUTF8String to a -//! minidump file. -//! -//! MinidumpUTF8StringWriter objects should not be instantiated directly outside -//! of the MinidumpWritable family of classes. -class MinidumpUTF8StringWriter final - : public MinidumpStringWriter { - public: - MinidumpUTF8StringWriter() : MinidumpStringWriter() {} - ~MinidumpUTF8StringWriter() override; - - //! \brief Sets the string to be written. - //! - //! \note Valid in #kStateMutable. - void SetUTF8(const std::string& string_utf8) { set_string(string_utf8); } - - //! \brief Retrieves the string to be written. - //! - //! \note Valid in any state. - const std::string& UTF8() const { return string(); } - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpUTF8StringWriter); -}; - -//! \brief The writer for a MinidumpRVAList object in a minidump file, -//! containing a list of \a MinidumpStringWriterType objects. -template -class MinidumpStringListWriter final : public MinidumpRVAListWriter { - public: - MinidumpStringListWriter(); - ~MinidumpStringListWriter() override; - - //! \brief Adds a new \a Traits::MinidumpStringWriterType for each element in - //! \a vector to the MinidumpRVAList. - //! - //! \param[in] vector The vector to use as source data. Each string in the - //! vector is treated as a UTF-8 string, and a new string writer will be - //! created for each one and made a child of the MinidumpStringListWriter. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromVector(const std::vector& vector); - - //! \brief Creates a new \a Traits::MinidumpStringWriterType object and adds - //! it to the MinidumpRVAList. - //! - //! This object creates a new string writer with string value \a string_utf8, - //! takes ownership of it, and becomes its parent in the overall tree of - //! MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void AddStringUTF8(const std::string& string_utf8); - - //! \brief Determines whether the object is useful. - //! - //! A useful object is one that carries data that makes a meaningful - //! contribution to a minidump file. An object carrying entries would be - //! considered useful. - //! - //! \return `true` if the object is useful, `false` otherwise. - bool IsUseful() const; - - private: - DISALLOW_COPY_AND_ASSIGN(MinidumpStringListWriter); -}; - -} // namespace internal - -using MinidumpUTF16StringListWriter = internal::MinidumpStringListWriter< - internal::MinidumpUTF16StringWriter>; -using MinidumpUTF8StringListWriter = internal::MinidumpStringListWriter< - internal::MinidumpUTF8StringWriter>; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_STRING_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_system_info_writer.h b/Tools/Crashpad/include/minidump/minidump_system_info_writer.h deleted file mode 100644 index 866530c304..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_system_info_writer.h +++ /dev/null @@ -1,197 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_ - -#include -#include -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class SystemSnapshot; - -namespace internal { -class MinidumpUTF16StringWriter; -} // namespace internal - -//! \brief The writer for a MINIDUMP_SYSTEM_INFO stream in a minidump file. -class MinidumpSystemInfoWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpSystemInfoWriter(); - ~MinidumpSystemInfoWriter() override; - - //! \brief Initializes MINIDUMP_SYSTEM_INFO based on \a system_snapshot. - //! - //! \param[in] system_snapshot The system snapshot to use as source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const SystemSnapshot* system_snapshot); - - //! \brief Sets MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. - void SetCPUArchitecture(MinidumpCPUArchitecture processor_architecture) { - system_info_.ProcessorArchitecture = processor_architecture; - } - - //! \brief Sets MINIDUMP_SYSTEM_INFO::ProcessorLevel and - //! MINIDUMP_SYSTEM_INFO::ProcessorRevision. - void SetCPULevelAndRevision(uint16_t processor_level, - uint16_t processor_revision) { - system_info_.ProcessorLevel = processor_level; - system_info_.ProcessorRevision = processor_revision; - } - - //! \brief Sets MINIDUMP_SYSTEM_INFO::NumberOfProcessors. - void SetCPUCount(uint8_t number_of_processors) { - system_info_.NumberOfProcessors = number_of_processors; - } - - //! \brief Sets MINIDUMP_SYSTEM_INFO::PlatformId. - void SetOS(MinidumpOS platform_id) { system_info_.PlatformId = platform_id; } - - //! \brief Sets MINIDUMP_SYSTEM_INFO::ProductType. - void SetOSType(MinidumpOSType product_type) { - system_info_.ProductType = product_type; - } - - //! \brief Sets MINIDUMP_SYSTEM_INFO::MajorVersion, - //! MINIDUMP_SYSTEM_INFO::MinorVersion, and - //! MINIDUMP_SYSTEM_INFO::BuildNumber. - void SetOSVersion(uint32_t major_version, - uint32_t minor_version, - uint32_t build_number) { - system_info_.MajorVersion = major_version; - system_info_.MinorVersion = minor_version; - system_info_.BuildNumber = build_number; - } - - //! \brief Arranges for MINIDUMP_SYSTEM_INFO::CSDVersionRva to point to a - //! MINIDUMP_STRING containing the supplied string. - //! - //! This method must be called prior to Freeze(). A CSD version is required - //! in all MINIDUMP_SYSTEM_INFO streams. An empty string is an acceptable - //! value. - void SetCSDVersion(const std::string& csd_version); - - //! \brief Sets MINIDUMP_SYSTEM_INFO::SuiteMask. - void SetSuiteMask(uint16_t suite_mask) { - system_info_.SuiteMask = suite_mask; - } - - //! \brief Sets \ref CPU_INFORMATION::VendorId - //! "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VendorId". - //! - //! This is only valid if SetCPUArchitecture() has been used to set the CPU - //! architecture to #kMinidumpCPUArchitectureX86 or - //! #kMinidumpCPUArchitectureX86Win64. - //! - //! \param[in] ebx The first 4 bytes of the CPU vendor string, the value - //! reported in `cpuid 0` `ebx`. - //! \param[in] edx The middle 4 bytes of the CPU vendor string, the value - //! reported in `cpuid 0` `edx`. - //! \param[in] ecx The last 4 bytes of the CPU vendor string, the value - //! reported by `cpuid 0` `ecx`. - //! - //! \note Do not call this method if SetCPUArchitecture() has been used to set - //! the CPU architecture to #kMinidumpCPUArchitectureAMD64. - //! - //! \sa SetCPUX86VendorString() - void SetCPUX86Vendor(uint32_t ebx, uint32_t edx, uint32_t ecx); - - //! \brief Sets \ref CPU_INFORMATION::VendorId - //! "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VendorId". - //! - //! This is only valid if SetCPUArchitecture() has been used to set the CPU - //! architecture to #kMinidumpCPUArchitectureX86 or - //! #kMinidumpCPUArchitectureX86Win64. - //! - //! \param[in] vendor The entire CPU vendor string, which must be exactly 12 - //! bytes long. - //! - //! \note Do not call this method if SetCPUArchitecture() has been used to set - //! the CPU architecture to #kMinidumpCPUArchitectureAMD64. - //! - //! \sa SetCPUX86Vendor() - void SetCPUX86VendorString(const std::string& vendor); - - //! \brief Sets \ref CPU_INFORMATION::VersionInformation - //! "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::VersionInformation" and - //! \ref CPU_INFORMATION::FeatureInformation - //! "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::FeatureInformation". - //! - //! This is only valid if SetCPUArchitecture() has been used to set the CPU - //! architecture to #kMinidumpCPUArchitectureX86 or - //! #kMinidumpCPUArchitectureX86Win64. - //! - //! \note Do not call this method if SetCPUArchitecture() has been used to set - //! the CPU architecture to #kMinidumpCPUArchitectureAMD64. - void SetCPUX86VersionAndFeatures(uint32_t version, uint32_t features); - - //! \brief Sets \ref CPU_INFORMATION::AMDExtendedCpuFeatures - //! "MINIDUMP_SYSTEM_INFO::Cpu::X86CpuInfo::AMDExtendedCPUFeatures". - //! - //! This is only valid if SetCPUArchitecture() has been used to set the CPU - //! architecture to #kMinidumpCPUArchitectureX86 or - //! #kMinidumpCPUArchitectureX86Win64, and if SetCPUX86Vendor() or - //! SetCPUX86VendorString() has been used to set the CPU vendor to - //! “AuthenticAMD”. - //! - //! \note Do not call this method if SetCPUArchitecture() has been used to set - //! the CPU architecture to #kMinidumpCPUArchitectureAMD64. - void SetCPUX86AMDExtendedFeatures(uint32_t extended_features); - - //! \brief Sets \ref CPU_INFORMATION::ProcessorFeatures - //! "MINIDUMP_SYSTEM_INFO::Cpu::OtherCpuInfo::ProcessorFeatures". - //! - //! This is only valid if SetCPUArchitecture() has been used to set the CPU - //! architecture to an architecture other than #kMinidumpCPUArchitectureX86 - //! or #kMinidumpCPUArchitectureX86Win64. - //! - //! \note This method may be called if SetCPUArchitecture() has been used to - //! set the CPU architecture to #kMinidumpCPUArchitectureAMD64. - void SetCPUOtherFeatures(uint64_t features_0, uint64_t features_1); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - MINIDUMP_SYSTEM_INFO system_info_; - std::unique_ptr csd_version_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpSystemInfoWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_SYSTEM_INFO_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_thread_id_map.h b/Tools/Crashpad/include/minidump/minidump_thread_id_map.h deleted file mode 100644 index 33b105fba1..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_thread_id_map.h +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_ - -#include - -#include -#include - -namespace crashpad { - -class ThreadSnapshot; - -//! \brief A map that connects 64-bit snapshot thread IDs to 32-bit minidump -//! thread IDs. -//! -//! 64-bit snapshot thread IDs are obtained from ThreadSnapshot::ThreadID(). -//! 32-bit minidump thread IDs are stored in MINIDUMP_THREAD::ThreadId. -//! -//! A ThreadIDMap ensures that there are no collisions among the set of 32-bit -//! minidump thread IDs. -using MinidumpThreadIDMap = std::map; - -//! \brief Builds a MinidumpThreadIDMap for a group of ThreadSnapshot objects. -//! -//! \param[in] thread_snapshots The thread snapshots to use as source data. -//! \param[out] thread_id_map A MinidumpThreadIDMap to be built by this method. -//! This map must be empty when this function is called. -//! -//! The map ensures that for any unique 64-bit thread ID found in a -//! ThreadSnapshot, the 32-bit thread ID used in a minidump file will also be -//! unique. -void BuildMinidumpThreadIDMap( - const std::vector& thread_snapshots, - MinidumpThreadIDMap* thread_id_map); - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_THREAD_ID_MAP_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_thread_writer.h b/Tools/Crashpad/include/minidump/minidump_thread_writer.h deleted file mode 100644 index 82092e2b61..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_thread_writer.h +++ /dev/null @@ -1,214 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_ - -#include -#include -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_thread_id_map.h" -#include "minidump/minidump_writable.h" - -namespace crashpad { - -class MinidumpContextWriter; -class MinidumpMemoryListWriter; -class SnapshotMinidumpMemoryWriter; -class ThreadSnapshot; - -//! \brief The writer for a MINIDUMP_THREAD object in a minidump file. -//! -//! Because MINIDUMP_THREAD objects only appear as elements of -//! MINIDUMP_THREAD_LIST objects, this class does not write any data on its own. -//! It makes its MINIDUMP_THREAD data available to its MinidumpThreadListWriter -//! parent, which writes it as part of a MINIDUMP_THREAD_LIST. -class MinidumpThreadWriter final : public internal::MinidumpWritable { - public: - MinidumpThreadWriter(); - ~MinidumpThreadWriter() override; - - //! \brief Initializes the MINIDUMP_THREAD based on \a thread_snapshot. - //! - //! \param[in] thread_snapshot The thread snapshot to use as source data. - //! \param[in] thread_id_map A MinidumpThreadIDMap to be consulted to - //! determine the 32-bit minidump thread ID to use for \a thread_snapshot. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot(const ThreadSnapshot* thread_snapshot, - const MinidumpThreadIDMap* thread_id_map); - - //! \brief Returns a MINIDUMP_THREAD referencing this object’s data. - //! - //! This method is expected to be called by a MinidumpThreadListWriter in - //! order to obtain a MINIDUMP_THREAD to include in its list. - //! - //! \note Valid in #kStateWritable. - const MINIDUMP_THREAD* MinidumpThread() const; - - //! \brief Returns a SnapshotMinidumpMemoryWriter that will write the memory - //! region corresponding to this object’s stack. - //! - //! If the thread does not have a stack, or its stack could not be determined, - //! this will return `nullptr`. - //! - //! This method is provided so that MinidumpThreadListWriter can obtain thread - //! stack memory regions for the purposes of adding them to a - //! MinidumpMemoryListWriter (configured by calling - //! MinidumpThreadListWriter::SetMemoryListWriter()) by calling - //! MinidumpMemoryListWriter::AddExtraMemory(). - //! - //! \note Valid in any state. - SnapshotMinidumpMemoryWriter* Stack() const { return stack_.get(); } - - //! \brief Arranges for MINIDUMP_THREAD::Stack to point to the MINIDUMP_MEMORY - //! object to be written by \a stack. - //! - //! This object takes ownership of \a stack and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetStack(std::unique_ptr stack); - - //! \brief Arranges for MINIDUMP_THREAD::ThreadContext to point to the CPU - //! context to be written by \a context. - //! - //! A context is required in all MINIDUMP_THREAD objects. - //! - //! This object takes ownership of \a context and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void SetContext(std::unique_ptr context); - - //! \brief Sets MINIDUMP_THREAD::ThreadId. - void SetThreadID(uint32_t thread_id) { thread_.ThreadId = thread_id; } - - //! \brief Sets MINIDUMP_THREAD::SuspendCount. - void SetSuspendCount(uint32_t suspend_count) { - thread_.SuspendCount = suspend_count; - } - - //! \brief Sets MINIDUMP_THREAD::PriorityClass. - void SetPriorityClass(uint32_t priority_class) { - thread_.PriorityClass = priority_class; - } - - //! \brief Sets MINIDUMP_THREAD::Priority. - void SetPriority(uint32_t priority) { thread_.Priority = priority; } - - //! \brief Sets MINIDUMP_THREAD::Teb. - void SetTEB(uint64_t teb) { thread_.Teb = teb; } - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MINIDUMP_THREAD thread_; - std::unique_ptr stack_; - std::unique_ptr context_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpThreadWriter); -}; - -//! \brief The writer for a MINIDUMP_THREAD_LIST stream in a minidump file, -//! containing a list of MINIDUMP_THREAD objects. -class MinidumpThreadListWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpThreadListWriter(); - ~MinidumpThreadListWriter() override; - - //! \brief Adds an initialized MINIDUMP_THREAD for each thread in \a - //! thread_snapshots to the MINIDUMP_THREAD_LIST. - //! - //! \param[in] thread_snapshots The thread snapshots to use as source data. - //! \param[out] thread_id_map A MinidumpThreadIDMap to be built by this - //! method. This map must be empty when this method is called. - //! - //! \note Valid in #kStateMutable. AddThread() may not be called before this - //! method, and it is not normally necessary to call AddThread() after - //! this method. - void InitializeFromSnapshot( - const std::vector& thread_snapshots, - MinidumpThreadIDMap* thread_id_map); - - //! \brief Sets the MinidumpMemoryListWriter that each thread’s stack memory - //! region should be added to as extra memory. - //! - //! Each MINIDUMP_THREAD object can contain a reference to a - //! SnapshotMinidumpMemoryWriter object that contains a snapshot of its stac - //! memory. In the overall tree of internal::MinidumpWritable objects, these - //! SnapshotMinidumpMemoryWriter objects are considered children of their - //! MINIDUMP_THREAD, and are referenced by a MINIDUMP_MEMORY_DESCRIPTOR - //! contained in the MINIDUMP_THREAD. It is also possible for the same memory - //! regions to have MINIDUMP_MEMORY_DESCRIPTOR objects present in a - //! MINIDUMP_MEMORY_LIST stream. This is accomplished by calling this method, - //! which informs a MinidumpThreadListWriter that it should call - //! MinidumpMemoryListWriter::AddExtraMemory() for each extant thread stack - //! while the thread is being added in AddThread(). When this is done, the - //! MinidumpMemoryListWriter will contain a MINIDUMP_MEMORY_DESCRIPTOR - //! pointing to the thread’s stack memory in its MINIDUMP_MEMORY_LIST. Note - //! that the actual contents of the memory is only written once, as a child of - //! the MinidumpThreadWriter. The MINIDUMP_MEMORY_DESCRIPTOR objects in both - //! the MINIDUMP_THREAD and MINIDUMP_MEMORY_LIST will point to the same copy - //! of the memory’s contents. - //! - //! \note This method must be called before AddThread() is called. Threads - //! added by AddThread() prior to this method being called will not have - //! their stacks added to \a memory_list_writer as extra memory. - //! \note Valid in #kStateMutable. - void SetMemoryListWriter(MinidumpMemoryListWriter* memory_list_writer); - - //! \brief Adds a MinidumpThreadWriter to the MINIDUMP_THREAD_LIST. - //! - //! This object takes ownership of \a thread and becomes its parent in the - //! overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void AddThread(std::unique_ptr thread); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - std::vector> threads_; - MinidumpMemoryListWriter* memory_list_writer_; // weak - MINIDUMP_THREAD_LIST thread_list_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpThreadListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_THREAD_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h b/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h deleted file mode 100644 index 97651dbac8..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_unloaded_module_writer.h +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright 2016 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_ - -#include -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_string_writer.h" -#include "minidump/minidump_writable.h" -#include "snapshot/unloaded_module_snapshot.h" - -namespace crashpad { - -//! \brief The writer for a MINIDUMP_UNLOADED_MODULE object in a minidump file. -//! -//! Because MINIDUMP_UNLOADED_MODULE objects only appear as elements of -//! MINIDUMP_UNLOADED_MODULE_LIST objects, this class does not write any data on -//! its own. It makes its MINIDUMP_UNLOADED_MODULE data available to its -//! MinidumpUnloadedModuleListWriter parent, which writes it as part of a -//! MINIDUMP_UNLOADED_MODULE_LIST. -class MinidumpUnloadedModuleWriter final : public internal::MinidumpWritable { - public: - MinidumpUnloadedModuleWriter(); - ~MinidumpUnloadedModuleWriter() override; - - //! \brief Initializes the MINIDUMP_UNLOADED_MODULE based on \a - //! unloaded_module_snapshot. - //! - //! \param[in] unloaded_module_snapshot The unloaded module snapshot to use as - //! source data. - //! - //! \note Valid in #kStateMutable. No mutator methods may be called before - //! this method, and it is not normally necessary to call any mutator - //! methods after this method. - void InitializeFromSnapshot( - const UnloadedModuleSnapshot& unloaded_module_snapshot); - - //! \brief Returns a MINIDUMP_UNLOADED_MODULE referencing this object’s data. - //! - //! This method is expected to be called by a MinidumpUnloadedModuleListWriter - //! in order to obtain a MINIDUMP_UNLOADED_MODULE to include in its list. - //! - //! \note Valid in #kStateWritable. - const MINIDUMP_UNLOADED_MODULE* MinidumpUnloadedModule() const; - - //! \brief Arranges for MINIDUMP_UNLOADED_MODULE::ModuleNameRva to point to a - //! MINIDUMP_STRING containing \a name. - //! - //! \note Valid in #kStateMutable. - void SetName(const std::string& name); - - //! \brief Sets MINIDUMP_UNLOADED_MODULE::BaseOfImage. - void SetImageBaseAddress(uint64_t image_base_address) { - unloaded_module_.BaseOfImage = image_base_address; - } - - //! \brief Sets MINIDUMP_UNLOADED_MODULE::SizeOfImage. - void SetImageSize(uint32_t image_size) { - unloaded_module_.SizeOfImage = image_size; - } - - //! \brief Sets MINIDUMP_UNLOADED_MODULE::CheckSum. - void SetChecksum(uint32_t checksum) { unloaded_module_.CheckSum = checksum; } - - //! \brief Sets MINIDUMP_UNLOADED_MODULE::TimeDateStamp. - //! - //! \note Valid in #kStateMutable. - void SetTimestamp(time_t timestamp); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - private: - MINIDUMP_UNLOADED_MODULE unloaded_module_; - std::unique_ptr name_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleWriter); -}; - -//! \brief The writer for a MINIDUMP_UNLOADED_MODULE_LIST stream in a minidump -//! file, containing a list of MINIDUMP_UNLOADED_MODULE objects. -class MinidumpUnloadedModuleListWriter final - : public internal::MinidumpStreamWriter { - public: - MinidumpUnloadedModuleListWriter(); - ~MinidumpUnloadedModuleListWriter() override; - - //! \brief Adds an initialized MINIDUMP_UNLOADED_MODULE for each unloaded - //! module in \a unloaded_module_snapshots to the - //! MINIDUMP_UNLOADED_MODULE_LIST. - //! - //! \param[in] unloaded_module_snapshots The unloaded module snapshots to use - //! as source data. - //! - //! \note Valid in #kStateMutable. AddUnloadedModule() may not be called - //! before this this method, and it is not normally necessary to call - //! AddUnloadedModule() after this method. - void InitializeFromSnapshot( - const std::vector& unloaded_module_snapshots); - - //! \brief Adds a MinidumpUnloadedModuleWriter to the - //! MINIDUMP_UNLOADED_MODULE_LIST. - //! - //! This object takes ownership of \a unloaded_module and becomes its parent - //! in the overall tree of internal::MinidumpWritable objects. - //! - //! \note Valid in #kStateMutable. - void AddUnloadedModule( - std::unique_ptr unloaded_module); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - std::vector> unloaded_modules_; - MINIDUMP_UNLOADED_MODULE_LIST unloaded_module_list_base_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpUnloadedModuleListWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_UNLOADED_MODULE_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h b/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h deleted file mode 100644 index 3eb0c8743a..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_user_extension_stream_data_source.h +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2017 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_ - -#include -#include - -#include "base/macros.h" - -#include "minidump/minidump_extensions.h" - -namespace crashpad { - -//! \brief Describes a user extension data stream in a minidump. -class MinidumpUserExtensionStreamDataSource { - public: - //! \brief An interface implemented by readers of - //! MinidumpUserExtensionStreamDataSource. - class Delegate { - public: - //! \brief Called by MinidumpUserExtensionStreamDataSource::Read() to - //! provide data requested by a call to that method. - //! - //! \param[in] data A pointer to the data that was read. The callee does not - //! take ownership of this data. This data is only valid for the - //! duration of the call to this method. This parameter may be `nullptr` - //! if \a size is `0`. - //! \param[in] size The size of the data that was read. - //! - //! \return `true` on success, `false` on failure. - //! MinidumpUserExtensionStreamDataSource::ReadStreamData() will use - //! this as its own return value. - virtual bool ExtensionStreamDataSourceRead(const void* data, - size_t size) = 0; - - protected: - ~Delegate() {} - }; - - //! \brief Constructs a MinidumpUserExtensionStreamDataSource. - //! - //! \param[in] stream_type The type of the user extension stream. - explicit MinidumpUserExtensionStreamDataSource(uint32_t stream_type); - virtual ~MinidumpUserExtensionStreamDataSource(); - - MinidumpStreamType stream_type() const { return stream_type_; } - - //! \brief The size of this data stream. - virtual size_t StreamDataSize() = 0; - - //! \brief Calls Delegate::UserStreamDataSourceRead(), providing it with - //! the stream data. - //! - //! Implementations do not necessarily compute the stream data prior to - //! this method being called. The stream data may be computed or loaded - //! lazily and may be discarded after being passed to the delegate. - //! - //! \return `false` on failure, otherwise, the return value of - //! Delegate::ExtensionStreamDataSourceRead(), which should be `true` on - //! success and `false` on failure. - virtual bool ReadStreamData(Delegate* delegate) = 0; - - private: - MinidumpStreamType stream_type_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpUserExtensionStreamDataSource); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_USER_EXTENSION_STREAM_DATA_SOURCE_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h b/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h deleted file mode 100644 index c1bad0ac92..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_user_stream_writer.h +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright 2016 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_ - -#include -#include -#include - -#include -#include - -#include "base/macros.h" -#include "minidump/minidump_extensions.h" -#include "minidump/minidump_stream_writer.h" -#include "minidump/minidump_writable.h" -#include "minidump/minidump_user_extension_stream_data_source.h" -#include "snapshot/module_snapshot.h" - -namespace crashpad { - -//! \brief The writer for a MINIDUMP_USER_STREAM in a minidump file. -class MinidumpUserStreamWriter final : public internal::MinidumpStreamWriter { - public: - MinidumpUserStreamWriter(); - ~MinidumpUserStreamWriter() override; - - //! \brief Initializes a MINIDUMP_USER_STREAM based on \a stream. - //! - //! \param[in] stream The memory and stream type to use as source data. - //! - //! \note Valid in #kStateMutable. - void InitializeFromSnapshot(const UserMinidumpStream* stream); - - //! \brief Initializes a MINIDUMP_USER_STREAM based on \a data_source. - //! - //! \param[in] data_source The content and type of the stream. - //! - //! \note Valid in #kStateMutable. - void InitializeFromUserExtensionStream( - std::unique_ptr data_source); - - protected: - // MinidumpWritable: - bool Freeze() override; - size_t SizeOfObject() override; - std::vector Children() override; - bool WriteObject(FileWriterInterface* file_writer) override; - - // MinidumpStreamWriter: - MinidumpStreamType StreamType() const override; - - private: - class ContentsWriter; - class SnapshotContentsWriter; - class ExtensionStreamContentsWriter; - - std::unique_ptr contents_writer_; - - MinidumpStreamType stream_type_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpUserStreamWriter); -}; - -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_USER_STREAM_WRITER_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_writable.h b/Tools/Crashpad/include/minidump/minidump_writable.h deleted file mode 100644 index b2ebf04e7d..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_writable.h +++ /dev/null @@ -1,280 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_ - -#include -#include -#include - -#include -#include - -#include "base/macros.h" -#include "util/file/file_io.h" - -namespace crashpad { - -class FileWriterInterface; - -namespace internal { - -//! \brief The base class for all content that might be written to a minidump -//! file. -class MinidumpWritable { - public: - virtual ~MinidumpWritable(); - - //! \brief Writes an object and all of its children to a minidump file. - //! - //! Use this on the root object of a tree of MinidumpWritable objects, - //! typically on a MinidumpFileWriter object. - //! - //! \param[in] file_writer The file writer to receive the minidump file’s - //! content. - //! - //! \return `true` on success. `false` on failure, with an appropriate message - //! logged. - //! - //! \note Valid in #kStateMutable, and transitions the object and the entire - //! tree beneath it through all states to #kStateWritten. - //! - //! \note This method should rarely be overridden. - virtual bool WriteEverything(FileWriterInterface* file_writer); - - //! \brief Registers a file offset pointer as one that should point to the - //! object on which this method is called. - //! - //! Once the file offset at which an object will be written is known (when it - //! enters #kStateWritable), registered RVA pointers will be updated. - //! - //! \param[in] rva A pointer to storage for the file offset that should - //! contain this object’s writable file offset, once it is known. - //! - //! \note Valid in #kStateFrozen or any preceding state. - // - // This is public instead of protected because objects of derived classes need - // to be able to register their own pointers with distinct objects. - void RegisterRVA(RVA* rva); - - //! \brief Registers a location descriptor as one that should point to the - //! object on which this method is called. - //! - //! Once an object’s size and the file offset at it will be written is known - //! (when it enters #kStateFrozen), the relevant data in registered location - //! descriptors will be updated. - //! - //! \param[in] location_descriptor A pointer to a location descriptor that - //! should contain this object’s writable size and file offset, once they - //! are known. - //! - //! \note Valid in #kStateFrozen or any preceding state. - // - // This is public instead of protected because objects of derived classes need - // to be able to register their own pointers with distinct objects. - void RegisterLocationDescriptor( - MINIDUMP_LOCATION_DESCRIPTOR* location_descriptor); - - protected: - //! \brief Identifies the state of an object. - //! - //! Objects will normally transition through each of these states as they are - //! created, populated with data, and then written to a minidump file. - enum State { - //! \brief The object’s properties can be modified. - kStateMutable = 0, - - //! \brief The object is “frozen”. - //! - //! Its properties cannot be modified. Pointers to file offsets of other - //! structures may not yet be valid. - kStateFrozen, - - //! \brief The object is writable. - //! - //! The file offset at which it will be written is known. Pointers to file - //! offsets of other structures are valid when all objects in a tree are in - //! this state. - kStateWritable, - - //! \brief The object has been written to a minidump file. - kStateWritten, - }; - - //! \brief Identifies the phase during which an object will be written to a - //! minidump file. - enum Phase { - //! \brief Objects that are written to a minidump file “early”. - //! - //! The normal sequence is for an object to write itself and then write all - //! of its children. - kPhaseEarly = 0, - - //! \brief Objects that are written to a minidump file “late”. - //! - //! Some objects, such as those capturing memory region snapshots, are - //! written to minidump files after all other objects. This “late” phase - //! identifies such objects. This is useful to improve spatial locality in - //! minidump files in accordance with expected access patterns: unlike most - //! other data, memory snapshots are large and do not usually need to be - //! consulted in their entirety in order to process a minidump file. - kPhaseLate, - }; - - //! \brief A size value used to signal failure by methods that return - //! `size_t`. - static constexpr size_t kInvalidSize = std::numeric_limits::max(); - - MinidumpWritable(); - - //! \brief The state of the object. - State state() const { return state_; } - - //! \brief Transitions the object from #kStateMutable to #kStateFrozen. - //! - //! The default implementation marks the object as frozen and recursively - //! calls Freeze() on all of its children. Subclasses may override this method - //! to perform processing that should only be done once callers have finished - //! populating an object with data. Typically, a subclass implementation would - //! call RegisterRVA() or RegisterLocationDescriptor() on other objects as - //! appropriate, because at the time Freeze() runs, the in-memory locations of - //! RVAs and location descriptors are known and will not change for the - //! remaining duration of an object’s lifetime. - //! - //! \return `true` on success. `false` on failure, with an appropriate message - //! logged. - virtual bool Freeze(); - - //! \brief Returns the amount of space that this object will consume when - //! written to a minidump file, in bytes, not including any leading or - //! trailing padding necessary to maintain proper alignment. - //! - //! \note Valid in #kStateFrozen or any subsequent state. - virtual size_t SizeOfObject() = 0; - - //! \brief Returns the object’s desired byte-boundary alignment. - //! - //! The default implementation returns `4`. Subclasses may override this as - //! needed. - //! - //! \note Valid in #kStateFrozen or any subsequent state. - virtual size_t Alignment(); - - //! \brief Returns the object’s children. - //! - //! \note Valid in #kStateFrozen or any subsequent state. - virtual std::vector Children(); - - //! \brief Returns the object’s desired write phase. - //! - //! The default implementation returns #kPhaseEarly. Subclasses may override - //! this method to alter their write phase. - //! - //! \note Valid in any state. - virtual Phase WritePhase(); - - //! \brief Prepares the object to be written at a known file offset, - //! transitioning it from #kStateFrozen to #kStateWritable. - //! - //! This method is responsible for determining the final file offset of the - //! object, which may be increased from \a offset to meet alignment - //! requirements. It calls WillWriteAtOffsetImpl() for the benefit of - //! subclasses. It populates all RVAs and location descriptors registered with - //! it via RegisterRVA() and RegisterLocationDescriptor(). It also recurses - //! into all known children. - //! - //! \param[in] phase The phase during which the object will be written. If - //! this does not match Phase(), processing is suppressed, although - //! recursive processing will still occur on all children. This addresses - //! the case where parents and children do not write in the same phase. - //! \param[in] offset The file offset at which the object will be written. The - //! offset may need to be adjusted for alignment. - //! \param[out] write_sequence This object will append itself to this list, - //! such that on return from a recursive tree of WillWriteAtOffset() - //! calls, elements of the vector will be organized in the sequence that - //! the objects will be written to the minidump file. - //! - //! \return The file size consumed by this object and all children, including - //! any padding inserted to meet alignment requirements. On failure, - //! #kInvalidSize, with an appropriate message logged. - //! - //! \note This method cannot be overridden. Subclasses that need to perform - //! processing when an object transitions to #kStateWritable should - //! implement WillWriteAtOffsetImpl(), which is called by this method. - size_t WillWriteAtOffset(Phase phase, - FileOffset* offset, - std::vector* write_sequence); - - //! \brief Called once an object’s writable file offset is determined, as it - //! transitions into #kStateWritable. - //! - //! Subclasses can override this method if they need to provide additional - //! processing once their writable file offset is known. Typically, this will - //! be done by subclasses that handle certain RVAs themselves instead of using - //! the RegisterRVA() interface. - //! - //! \param[in] offset The file offset at which the object will be written. The - //! value passed to this method will already have been adjusted to meet - //! alignment requirements. - //! - //! \return `true` on success. `false` on error, indicating that the minidump - //! file should not be written. - //! - //! \note Valid in #kStateFrozen. The object will transition to - //! #kStateWritable after this method returns. - virtual bool WillWriteAtOffsetImpl(FileOffset offset); - - //! \brief Writes the object, transitioning it from #kStateWritable to - //! #kStateWritten. - //! - //! Writes any padding necessary to meet alignment requirements, and then - //! calls WriteObject() to write the object’s content. - //! - //! \param[in] file_writer The file writer to receive the object’s content. - //! - //! \return `true` on success. `false` on error with an appropriate message - //! logged. - //! - //! \note This method cannot be overridden. Subclasses must override - //! WriteObject(). - bool WritePaddingAndObject(FileWriterInterface* file_writer); - - //! \brief Writes the object’s content. - //! - //! \param[in] file_writer The file writer to receive the object’s content. - //! - //! \return `true` on success. `false` on error, indicating that the content - //! could not be written to the minidump file. - //! - //! \note Valid in #kStateWritable. The object will transition to - //! #kStateWritten after this method returns. - virtual bool WriteObject(FileWriterInterface* file_writer) = 0; - - private: - std::vector registered_rvas_; // weak - - // weak - std::vector registered_location_descriptors_; - - size_t leading_pad_bytes_; - State state_; - - DISALLOW_COPY_AND_ASSIGN(MinidumpWritable); -}; - -} // namespace internal -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_WRITABLE_H_ diff --git a/Tools/Crashpad/include/minidump/minidump_writer_util.h b/Tools/Crashpad/include/minidump/minidump_writer_util.h deleted file mode 100644 index 7ebe3f3aa1..0000000000 --- a/Tools/Crashpad/include/minidump/minidump_writer_util.h +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright 2014 The Crashpad Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#ifndef CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_ -#define CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_ - -#include -#include -#include - -#include - -#include "base/macros.h" -#include "base/strings/string16.h" - -namespace crashpad { -namespace internal { - -//! \brief A collection of utility functions used by the MinidumpWritable family -//! of classes. -class MinidumpWriterUtil final { - public: - //! \brief Assigns a `time_t` value, logging a warning if the result overflows - //! the destination buffer and will be truncated. - //! - //! \param[out] destination A pointer to the variable to be assigned to. - //! \param[in] source The value to assign. - //! - //! The minidump format uses `uint32_t` for many timestamp values, but - //! `time_t` may be wider than this. These year 2038 bugs are a limitation of - //! the minidump format. An out-of-range error will be noted with a warning, - //! but is not considered fatal. \a source will be truncated and assigned to - //! \a destination in this case. - //! - //! For `time_t` values with nonfatal overflow semantics, this function is - //! used in preference to AssignIfInRange(), which fails without performing an - //! assignment when an out-of-range condition is detected. - static void AssignTimeT(uint32_t* destination, time_t source); - - //! \brief Converts a UTF-8 string to UTF-16 and returns it. If the string - //! cannot be converted losslessly, indicating that the input is not - //! well-formed UTF-8, a warning is logged. - //! - //! \param[in] utf8 The UTF-8-encoded string to convert. - //! - //! \return The \a utf8 string, converted to UTF-16 encoding. If the - //! conversion is lossy, U+FFFD “replacement characters” will be - //! introduced. - static base::string16 ConvertUTF8ToUTF16(const std::string& utf8); - - //! \brief Converts a UTF-8 string to UTF-16 and places it into a buffer of - //! fixed size, taking care to `NUL`-terminate the buffer and not to - //! overflow it. If the string will be truncated or if it cannot be - //! converted losslessly, a warning is logged. - //! - //! Any unused portion of the \a destination buffer that is not written to by - //! the converted string will be overwritten with `NUL` UTF-16 code units, - //! thus, this function always writes \a destination_size `char16` units. - //! - //! If the conversion is lossy, U+FFFD “replacement characters” will be - //! introduced. - //! - //! \param[out] destination A pointer to the destination buffer, where the - //! UTF-16-encoded string will be written. - //! \param[in] destination_size The size of \a destination in `char16` units, - //! including space used by a `NUL` terminator. - //! \param[in] source The UTF-8-encoded input string. - static void AssignUTF8ToUTF16(base::char16* destination, - size_t destination_size, - const std::string& source); - - private: - DISALLOW_IMPLICIT_CONSTRUCTORS(MinidumpWriterUtil); -}; - -} // namespace internal -} // namespace crashpad - -#endif // CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_ diff --git a/Tools/Crashpad/include/third_party/getopt/LICENSE b/Tools/Crashpad/include/third_party/getopt/LICENSE deleted file mode 100644 index 4444b1201e..0000000000 --- a/Tools/Crashpad/include/third_party/getopt/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (C) 1997 Gregory Pietsch - -[These files] are hereby placed in the public domain without restrictions. Just -give the author credit, don't claim you wrote it or prevent anyone else from -using it. diff --git a/Tools/Crashpad/include/third_party/getopt/getopt.h b/Tools/Crashpad/include/third_party/getopt/getopt.h deleted file mode 100644 index 27ab0dd4e5..0000000000 --- a/Tools/Crashpad/include/third_party/getopt/getopt.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright (C) 1997 Gregory Pietsch - -[These files] are hereby placed in the public domain without restrictions. Just -give the author credit, don't claim you wrote it or prevent anyone else from -using it. -*/ - -#ifndef GETOPT_H -#define GETOPT_H - -/* include files needed by this include file */ - -/* macros defined by this include file */ -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -/* types defined by this include file */ - -namespace crashpad { - -/* GETOPT_LONG_OPTION_T: The type of long option */ -typedef struct GETOPT_LONG_OPTION_T -{ - const char *name; /* the name of the long option */ - int has_arg; /* one of the above macros */ - int *flag; /* determines if getopt_long() returns a - * value for a long option; if it is - * non-NULL, 0 is returned as a function - * value and the value of val is stored in - * the area pointed to by flag. Otherwise, - * val is returned. */ - int val; /* determines the value to return if flag is - * NULL. */ -} GETOPT_LONG_OPTION_T; - -typedef GETOPT_LONG_OPTION_T option; - -/* externally-defined variables */ -extern char *optarg; -extern int optind; -extern int opterr; -extern int optopt; - -/* function prototypes */ -int getopt(int argc, char** argv, char* optstring); -int getopt_long(int argc, - char** argv, - const char* shortopts, - const GETOPT_LONG_OPTION_T* longopts, - int* longind); -int getopt_long_only(int argc, - char** argv, - const char* shortopts, - const GETOPT_LONG_OPTION_T* longopts, - int* longind); - -} // namespace crashpad - -#endif /* GETOPT_H */ - -/* END OF FILE getopt.h */ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h deleted file mode 100644 index 2a08de32e4..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops.h +++ /dev/null @@ -1,198 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// For atomic operations on reference counts, see atomic_refcount.h. -// For atomic operations on sequence numbers, see atomic_sequence_num.h. - -// The routines exported by this module are subtle. If you use them, even if -// you get the code right, it will depend on careful reasoning about atomicity -// and memory ordering; it will be less readable, and harder to maintain. If -// you plan to use these routines, you should have a good reason, such as solid -// evidence that performance would otherwise suffer, or there being no -// alternative. You should assume only properties explicitly guaranteed by the -// specifications in this file. You are almost certainly _not_ writing code -// just for the x86; if you assume x86 semantics, x86 hardware bugs and -// implementations on other archtectures will cause your code to break. If you -// do not know what you are doing, avoid these routines, and use a Mutex. -// -// It is incorrect to make direct assignments to/from an atomic variable. -// You should use one of the Load or Store routines. The NoBarrier -// versions are provided when no barriers are needed: -// NoBarrier_Store() -// NoBarrier_Load() -// Although there are currently no compiler enforcement, you are encouraged -// to use these. -// - -#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_H_ -#define MINI_CHROMIUM_BASE_ATOMICOPS_H_ - -#include - -// Small C++ header which defines implementation specific macros used to -// identify the STL implementation. -// - libc++: captures __config for _LIBCPP_VERSION -// - libstdc++: captures bits/c++config.h for __GLIBCXX__ -#include - -#include "build/build_config.h" - -#if defined(OS_WIN) && defined(ARCH_CPU_64_BITS) -// windows.h #defines this (only on x64). This causes problems because the -// public API also uses MemoryBarrier at the public name for this fence. So, on -// X64, undef it, and call its documented -// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx) -// implementation directly. -#undef MemoryBarrier -#endif - -namespace base { -namespace subtle { - -typedef int32_t Atomic32; -#ifdef ARCH_CPU_64_BITS -// We need to be able to go between Atomic64 and AtomicWord implicitly. This -// means Atomic64 and AtomicWord should be the same type on 64-bit. -#if defined(__ILP32__) || defined(OS_NACL) -// NaCl's intptr_t is not actually 64-bits on 64-bit! -// http://code.google.com/p/nativeclient/issues/detail?id=1162 -typedef int64_t Atomic64; -#else -typedef intptr_t Atomic64; -#endif -#endif - -// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or -// Atomic64 routines below, depending on your architecture. -typedef intptr_t AtomicWord; - -// Atomically execute: -// result = *ptr; -// if (*ptr == old_value) -// *ptr = new_value; -// return result; -// -// I.e., replace "*ptr" with "new_value" if "*ptr" used to be "old_value". -// Always return the old value of "*ptr" -// -// This routine implies no memory barriers. -Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value); - -// Atomically store new_value into *ptr, returning the previous value held in -// *ptr. This routine implies no memory barriers. -Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, Atomic32 new_value); - -// Atomically increment *ptr by "increment". Returns the new value of -// *ptr with the increment applied. This routine implies no memory barriers. -Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, Atomic32 increment); - -Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment); - -// These following lower-level operations are typically useful only to people -// implementing higher-level synchronization operations like spinlocks, -// mutexes, and condition-variables. They combine CompareAndSwap(), a load, or -// a store with appropriate memory-ordering instructions. "Acquire" operations -// ensure that no later memory access can be reordered ahead of the operation. -// "Release" operations ensure that no previous memory access can be reordered -// after the operation. "Barrier" operations have both "Acquire" and "Release" -// semantics. A MemoryBarrier() has "Barrier" semantics, but does no memory -// access. -Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value); -Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value); - -void MemoryBarrier(); -void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value); -void Acquire_Store(volatile Atomic32* ptr, Atomic32 value); -void Release_Store(volatile Atomic32* ptr, Atomic32 value); - -Atomic32 NoBarrier_Load(volatile const Atomic32* ptr); -Atomic32 Acquire_Load(volatile const Atomic32* ptr); -Atomic32 Release_Load(volatile const Atomic32* ptr); - -// 64-bit atomic operations (only available on 64-bit processors). -#ifdef ARCH_CPU_64_BITS -Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value); -Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, Atomic64 new_value); -Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment); -Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, Atomic64 increment); - -Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value); -Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value); -void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value); -void Acquire_Store(volatile Atomic64* ptr, Atomic64 value); -void Release_Store(volatile Atomic64* ptr, Atomic64 value); -Atomic64 NoBarrier_Load(volatile const Atomic64* ptr); -Atomic64 Acquire_Load(volatile const Atomic64* ptr); -Atomic64 Release_Load(volatile const Atomic64* ptr); -#endif // ARCH_CPU_64_BITS - -} // namespace subtle -} // namespace base - -// The following x86 CPU features are used in atomicops_internals_x86_gcc.h, but -// this file is duplicated inside of Chrome: protobuf and tcmalloc rely on the -// struct being present at link time. Some parts of Chrome can currently use the -// portable interface whereas others still use GCC one. The include guards are -// the same as in atomicops_internals_x86_gcc.cc. -#if defined(__i386__) || defined(__x86_64__) -// This struct is not part of the public API of this module; clients may not -// use it. (However, it's exported via BASE_EXPORT because clients implicitly -// do use it at link time by inlining these functions.) -// Features of this x86. Values may not be correct before main() is run, -// but are set conservatively. -struct AtomicOps_x86CPUFeatureStruct { - bool has_amd_lock_mb_bug; // Processor has AMD memory-barrier bug; do lfence - // after acquire compare-and-swap. - // The following fields are unused by Chrome's base implementation but are - // still used by copies of the same code in other parts of the code base. This - // causes an ODR violation, and the other code is likely reading invalid - // memory. - // TODO(jfb) Delete these fields once the rest of the Chrome code base doesn't - // depend on them. - bool has_sse2; // Processor has SSE2. - bool has_cmpxchg16b; // Processor supports cmpxchg16b instruction. -}; -extern struct AtomicOps_x86CPUFeatureStruct AtomicOps_Internalx86CPUFeatures; -#endif - -// Try to use a portable implementation based on C++11 atomics. -// -// Some toolchains support C++11 language features without supporting library -// features (recent compiler, older STL). Whitelist libstdc++ and libc++ that we -// know will have when compiling C++11. -#if ((__cplusplus >= 201103L) && \ - ((defined(__GLIBCXX__) && (__GLIBCXX__ > 20110216)) || \ - (defined(_LIBCPP_VERSION) && (_LIBCPP_STD_VER >= 11)))) -# include "base/atomicops_internals_portable.h" -#else // Otherwise use a platform specific implementation. -# if (defined(OS_WIN) && defined(COMPILER_MSVC) && \ - defined(ARCH_CPU_X86_FAMILY)) -# include "base/atomicops_internals_x86_msvc.h" -# elif defined(OS_MACOSX) -# include "base/atomicops_internals_mac.h" -# else -# error "Atomic operations are not supported on your platform" -# endif -#endif // Portable / non-portable includes. - -// On some platforms we need additional declarations to make -// AtomicWord compatible with our other Atomic* types. -#if defined(OS_MACOSX) || defined(OS_OPENBSD) -#include "base/atomicops_internals_atomicword_compat.h" -#endif - -#endif // MINI_CHROMIUM_BASE_ATOMICOPS_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h deleted file mode 100644 index d5b8caaf61..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_atomicword_compat.h +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is an internal atomic implementation, use base/atomicops.h instead. - -#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ -#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ - -// AtomicWord is a synonym for intptr_t, and Atomic32 is a synonym for int32, -// which in turn means int. On some LP32 platforms, intptr_t is an int, but -// on others, it's a long. When AtomicWord and Atomic32 are based on different -// fundamental types, their pointers are incompatible. -// -// This file defines function overloads to allow both AtomicWord and Atomic32 -// data to be used with this interface. -// -// On LP64 platforms, AtomicWord and Atomic64 are both always long, -// so this problem doesn't occur. - -#if !defined(ARCH_CPU_64_BITS) - -namespace base { -namespace subtle { - -inline AtomicWord NoBarrier_CompareAndSwap(volatile AtomicWord* ptr, - AtomicWord old_value, - AtomicWord new_value) { - return NoBarrier_CompareAndSwap( - reinterpret_cast(ptr), old_value, new_value); -} - -inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr, - AtomicWord new_value) { - return NoBarrier_AtomicExchange( - reinterpret_cast(ptr), new_value); -} - -inline AtomicWord NoBarrier_AtomicIncrement(volatile AtomicWord* ptr, - AtomicWord increment) { - return NoBarrier_AtomicIncrement( - reinterpret_cast(ptr), increment); -} - -inline AtomicWord Barrier_AtomicIncrement(volatile AtomicWord* ptr, - AtomicWord increment) { - return Barrier_AtomicIncrement( - reinterpret_cast(ptr), increment); -} - -inline AtomicWord Acquire_CompareAndSwap(volatile AtomicWord* ptr, - AtomicWord old_value, - AtomicWord new_value) { - return base::subtle::Acquire_CompareAndSwap( - reinterpret_cast(ptr), old_value, new_value); -} - -inline AtomicWord Release_CompareAndSwap(volatile AtomicWord* ptr, - AtomicWord old_value, - AtomicWord new_value) { - return base::subtle::Release_CompareAndSwap( - reinterpret_cast(ptr), old_value, new_value); -} - -inline void NoBarrier_Store(volatile AtomicWord *ptr, AtomicWord value) { - NoBarrier_Store( - reinterpret_cast(ptr), value); -} - -inline void Acquire_Store(volatile AtomicWord* ptr, AtomicWord value) { - return base::subtle::Acquire_Store( - reinterpret_cast(ptr), value); -} - -inline void Release_Store(volatile AtomicWord* ptr, AtomicWord value) { - return base::subtle::Release_Store( - reinterpret_cast(ptr), value); -} - -inline AtomicWord NoBarrier_Load(volatile const AtomicWord *ptr) { - return NoBarrier_Load( - reinterpret_cast(ptr)); -} - -inline AtomicWord Acquire_Load(volatile const AtomicWord* ptr) { - return base::subtle::Acquire_Load( - reinterpret_cast(ptr)); -} - -inline AtomicWord Release_Load(volatile const AtomicWord* ptr) { - return base::subtle::Release_Load( - reinterpret_cast(ptr)); -} - -} // namespace base::subtle -} // namespace base - -#endif // !defined(ARCH_CPU_64_BITS) - -#endif // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_ATOMICWORD_COMPAT_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h deleted file mode 100644 index dff655fdb5..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_mac.h +++ /dev/null @@ -1,197 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is an internal atomic implementation, use base/atomicops.h instead. - -#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_ -#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_ - -#include - -namespace base { -namespace subtle { - -inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - Atomic32 prev_value; - do { - if (OSAtomicCompareAndSwap32(old_value, new_value, - const_cast(ptr))) { - return old_value; - } - prev_value = *ptr; - } while (prev_value == old_value); - return prev_value; -} - -inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, - Atomic32 new_value) { - Atomic32 old_value; - do { - old_value = *ptr; - } while (!OSAtomicCompareAndSwap32(old_value, new_value, - const_cast(ptr))); - return old_value; -} - -inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return OSAtomicAdd32(increment, const_cast(ptr)); -} - -inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return OSAtomicAdd32Barrier(increment, const_cast(ptr)); -} - -inline void MemoryBarrier() { - OSMemoryBarrier(); -} - -inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - Atomic32 prev_value; - do { - if (OSAtomicCompareAndSwap32Barrier(old_value, new_value, - const_cast(ptr))) { - return old_value; - } - prev_value = *ptr; - } while (prev_value == old_value); - return prev_value; -} - -inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - return Acquire_CompareAndSwap(ptr, old_value, new_value); -} - -inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; -} - -inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; - MemoryBarrier(); -} - -inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { - MemoryBarrier(); - *ptr = value; -} - -inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { - return *ptr; -} - -inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { - Atomic32 value = *ptr; - MemoryBarrier(); - return value; -} - -inline Atomic32 Release_Load(volatile const Atomic32* ptr) { - MemoryBarrier(); - return *ptr; -} - -#ifdef __LP64__ - -// 64-bit implementation on 64-bit platform - -inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - Atomic64 prev_value; - do { - if (OSAtomicCompareAndSwap64(old_value, new_value, - reinterpret_cast(ptr))) { - return old_value; - } - prev_value = *ptr; - } while (prev_value == old_value); - return prev_value; -} - -inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, - Atomic64 new_value) { - Atomic64 old_value; - do { - old_value = *ptr; - } while (!OSAtomicCompareAndSwap64(old_value, new_value, - reinterpret_cast(ptr))); - return old_value; -} - -inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return OSAtomicAdd64(increment, reinterpret_cast(ptr)); -} - -inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return OSAtomicAdd64Barrier(increment, - reinterpret_cast(ptr)); -} - -inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - Atomic64 prev_value; - do { - if (OSAtomicCompareAndSwap64Barrier( - old_value, new_value, reinterpret_cast(ptr))) { - return old_value; - } - prev_value = *ptr; - } while (prev_value == old_value); - return prev_value; -} - -inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - // The lib kern interface does not distinguish between - // Acquire and Release memory barriers; they are equivalent. - return Acquire_CompareAndSwap(ptr, old_value, new_value); -} - -inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) { - *ptr = value; -} - -inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) { - *ptr = value; - MemoryBarrier(); -} - -inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { - MemoryBarrier(); - *ptr = value; -} - -inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { - return *ptr; -} - -inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { - Atomic64 value = *ptr; - MemoryBarrier(); - return value; -} - -inline Atomic64 Release_Load(volatile const Atomic64* ptr) { - MemoryBarrier(); - return *ptr; -} - -#endif // defined(__LP64__) - -} // namespace base::subtle -} // namespace base - -#endif // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_MAC_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h deleted file mode 100644 index db610523c1..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_portable.h +++ /dev/null @@ -1,227 +0,0 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is an internal atomic implementation, use atomicops.h instead. -// -// This implementation uses C++11 atomics' member functions. The code base is -// currently written assuming atomicity revolves around accesses instead of -// C++11's memory locations. The burden is on the programmer to ensure that all -// memory locations accessed atomically are never accessed non-atomically (tsan -// should help with this). -// -// TODO(jfb) Modify the atomicops.h API and user code to declare atomic -// locations as truly atomic. See the static_assert below. -// -// Of note in this implementation: -// * All NoBarrier variants are implemented as relaxed. -// * All Barrier variants are implemented as sequentially-consistent. -// * Compare exchange's failure ordering is always the same as the success one -// (except for release, which fails as relaxed): using a weaker ordering is -// only valid under certain uses of compare exchange. -// * Acquire store doesn't exist in the C11 memory model, it is instead -// implemented as a relaxed store followed by a sequentially consistent -// fence. -// * Release load doesn't exist in the C11 memory model, it is instead -// implemented as sequentially consistent fence followed by a relaxed load. -// * Atomic increment is expected to return the post-incremented value, whereas -// C11 fetch add returns the previous value. The implementation therefore -// needs to increment twice (which the compiler should be able to detect and -// optimize). - -#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_ -#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_ - -#include - -namespace base { -namespace subtle { - -// This implementation is transitional and maintains the original API for -// atomicops.h. This requires casting memory locations to the atomic types, and -// assumes that the API and the C++11 implementation are layout-compatible, -// which isn't true for all implementations or hardware platforms. The static -// assertion should detect this issue, were it to fire then this header -// shouldn't be used. -// -// TODO(jfb) If this header manages to stay committed then the API should be -// modified, and all call sites updated. -typedef volatile std::atomic* AtomicLocation32; -static_assert(sizeof(*(AtomicLocation32) nullptr) == sizeof(Atomic32), - "incompatible 32-bit atomic layout"); - -inline void MemoryBarrier() { -#if defined(__GLIBCXX__) - // Work around libstdc++ bug 51038 where atomic_thread_fence was declared but - // not defined, leading to the linker complaining about undefined references. - __atomic_thread_fence(std::memory_order_seq_cst); -#else - std::atomic_thread_fence(std::memory_order_seq_cst); -#endif -} - -inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - ((AtomicLocation32)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_relaxed, - std::memory_order_relaxed); - return old_value; -} - -inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, - Atomic32 new_value) { - return ((AtomicLocation32)ptr) - ->exchange(new_value, std::memory_order_relaxed); -} - -inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return increment + - ((AtomicLocation32)ptr) - ->fetch_add(increment, std::memory_order_relaxed); -} - -inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return increment + ((AtomicLocation32)ptr)->fetch_add(increment); -} - -inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - ((AtomicLocation32)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_acquire, - std::memory_order_acquire); - return old_value; -} - -inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - ((AtomicLocation32)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_release, - std::memory_order_relaxed); - return old_value; -} - -inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { - ((AtomicLocation32)ptr)->store(value, std::memory_order_relaxed); -} - -inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { - ((AtomicLocation32)ptr)->store(value, std::memory_order_relaxed); - MemoryBarrier(); -} - -inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { - ((AtomicLocation32)ptr)->store(value, std::memory_order_release); -} - -inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { - return ((AtomicLocation32)ptr)->load(std::memory_order_relaxed); -} - -inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { - return ((AtomicLocation32)ptr)->load(std::memory_order_acquire); -} - -inline Atomic32 Release_Load(volatile const Atomic32* ptr) { - MemoryBarrier(); - return ((AtomicLocation32)ptr)->load(std::memory_order_relaxed); -} - -#if defined(ARCH_CPU_64_BITS) - -typedef volatile std::atomic* AtomicLocation64; -static_assert(sizeof(*(AtomicLocation64) nullptr) == sizeof(Atomic64), - "incompatible 64-bit atomic layout"); - -inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - ((AtomicLocation64)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_relaxed, - std::memory_order_relaxed); - return old_value; -} - -inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, - Atomic64 new_value) { - return ((AtomicLocation64)ptr) - ->exchange(new_value, std::memory_order_relaxed); -} - -inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return increment + - ((AtomicLocation64)ptr) - ->fetch_add(increment, std::memory_order_relaxed); -} - -inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return increment + ((AtomicLocation64)ptr)->fetch_add(increment); -} - -inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - ((AtomicLocation64)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_acquire, - std::memory_order_acquire); - return old_value; -} - -inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - ((AtomicLocation64)ptr) - ->compare_exchange_strong(old_value, - new_value, - std::memory_order_release, - std::memory_order_relaxed); - return old_value; -} - -inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) { - ((AtomicLocation64)ptr)->store(value, std::memory_order_relaxed); -} - -inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) { - ((AtomicLocation64)ptr)->store(value, std::memory_order_relaxed); - MemoryBarrier(); -} - -inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { - ((AtomicLocation64)ptr)->store(value, std::memory_order_release); -} - -inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { - return ((AtomicLocation64)ptr)->load(std::memory_order_relaxed); -} - -inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { - return ((AtomicLocation64)ptr)->load(std::memory_order_acquire); -} - -inline Atomic64 Release_Load(volatile const Atomic64* ptr) { - MemoryBarrier(); - return ((AtomicLocation64)ptr)->load(std::memory_order_relaxed); -} - -#endif // defined(ARCH_CPU_64_BITS) -} -} // namespace base::subtle - -#endif // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_PORTABLE_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h deleted file mode 100644 index 353158d07b..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/atomicops_internals_x86_msvc.h +++ /dev/null @@ -1,193 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file is an internal atomic implementation, use base/atomicops.h instead. - -#ifndef MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_ -#define MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_ - -#include - -#include - -#if defined(ARCH_CPU_64_BITS) -// windows.h #defines this (only on x64). This causes problems because the -// public API also uses MemoryBarrier at the public name for this fence. So, on -// X64, undef it, and call its documented -// (http://msdn.microsoft.com/en-us/library/windows/desktop/ms684208.aspx) -// implementation directly. -#undef MemoryBarrier -#endif - -namespace base { -namespace subtle { - -inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - LONG result = _InterlockedCompareExchange( - reinterpret_cast(ptr), - static_cast(new_value), - static_cast(old_value)); - return static_cast(result); -} - -inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, - Atomic32 new_value) { - LONG result = _InterlockedExchange( - reinterpret_cast(ptr), - static_cast(new_value)); - return static_cast(result); -} - -inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return _InterlockedExchangeAdd( - reinterpret_cast(ptr), - static_cast(increment)) + increment; -} - -inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, - Atomic32 increment) { - return Barrier_AtomicIncrement(ptr, increment); -} - -inline void MemoryBarrier() { -#if defined(ARCH_CPU_64_BITS) - // See #undef and note at the top of this file. - __faststorefence(); -#else - // We use MemoryBarrier from WinNT.h - ::MemoryBarrier(); -#endif -} - -inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -} - -inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { - return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -} - -inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; -} - -inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { - NoBarrier_AtomicExchange(ptr, value); - // acts as a barrier in this implementation -} - -inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; // works w/o barrier for current Intel chips as of June 2005 - // See comments in Atomic64 version of Release_Store() below. -} - -inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { - return *ptr; -} - -inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { - Atomic32 value = *ptr; - return value; -} - -inline Atomic32 Release_Load(volatile const Atomic32* ptr) { - MemoryBarrier(); - return *ptr; -} - -#if defined(_WIN64) - -// 64-bit low-level operations on 64-bit platform. - -static_assert(sizeof(Atomic64) == sizeof(PVOID), "atomic word is atomic"); - -inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - PVOID result = InterlockedCompareExchangePointer( - reinterpret_cast(ptr), - reinterpret_cast(new_value), reinterpret_cast(old_value)); - return reinterpret_cast(result); -} - -inline Atomic64 NoBarrier_AtomicExchange(volatile Atomic64* ptr, - Atomic64 new_value) { - PVOID result = InterlockedExchangePointer( - reinterpret_cast(ptr), - reinterpret_cast(new_value)); - return reinterpret_cast(result); -} - -inline Atomic64 Barrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return InterlockedExchangeAdd64( - reinterpret_cast(ptr), - static_cast(increment)) + increment; -} - -inline Atomic64 NoBarrier_AtomicIncrement(volatile Atomic64* ptr, - Atomic64 increment) { - return Barrier_AtomicIncrement(ptr, increment); -} - -inline void NoBarrier_Store(volatile Atomic64* ptr, Atomic64 value) { - *ptr = value; -} - -inline void Acquire_Store(volatile Atomic64* ptr, Atomic64 value) { - NoBarrier_AtomicExchange(ptr, value); - // acts as a barrier in this implementation -} - -inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { - *ptr = value; // works w/o barrier for current Intel chips as of June 2005 - - // When new chips come out, check: - // IA-32 Intel Architecture Software Developer's Manual, Volume 3: - // System Programming Guide, Chatper 7: Multiple-processor management, - // Section 7.2, Memory Ordering. - // Last seen at: - // http://developer.intel.com/design/pentium4/manuals/index_new.htm -} - -inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { - return *ptr; -} - -inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { - Atomic64 value = *ptr; - return value; -} - -inline Atomic64 Release_Load(volatile const Atomic64* ptr) { - MemoryBarrier(); - return *ptr; -} - -inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -} - -inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, - Atomic64 old_value, - Atomic64 new_value) { - return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -} - - -#endif // defined(_WIN64) - -} // namespace base::subtle -} // namespace base - -#endif // MINI_CHROMIUM_BASE_ATOMICOPS_INTERNALS_X86_MSVC_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h deleted file mode 100644 index 03b4015d55..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/auto_reset.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_AUTO_RESET_H_ -#define MINI_CHROMIUM_BASE_AUTO_RESET_H_ - -#include "base/macros.h" - -namespace base { - -template -class AutoReset { - public: - AutoReset(T* scoped_variable, T new_value) - : scoped_variable_(scoped_variable), - original_value_(*scoped_variable) { - *scoped_variable_ = new_value; - } - - ~AutoReset() { *scoped_variable_ = original_value_; } - - private: - T* scoped_variable_; - T original_value_; - - DISALLOW_COPY_AND_ASSIGN(AutoReset); -}; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_AUTO_RESET_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h deleted file mode 100644 index a93ba63ef8..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/bit_cast.h +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_BIT_CAST_H_ -#define MINI_CHROMIUM_BASE_BIT_CAST_H_ - -#include -#include - -#include "base/compiler_specific.h" -#include "build/build_config.h" - -// bit_cast is a template function that implements the equivalent -// of "*reinterpret_cast(&source)". We need this in very low-level -// functions like the protobuf library and fast math support. -// -// float f = 3.14159265358979; -// int i = bit_cast(f); -// // i = 0x40490fdb -// -// The classical address-casting method is: -// -// // WRONG -// float f = 3.14159265358979; // WRONG -// int i = * reinterpret_cast(&f); // WRONG -// -// The address-casting method actually produces undefined behavior according to -// the ISO C++98 specification, section 3.10 ("basic.lval"), paragraph 15. -// (This did not substantially change in C++11.) Roughly, this section says: if -// an object in memory has one type, and a program accesses it with a different -// type, then the result is undefined behavior for most values of "different -// type". -// -// This is true for any cast syntax, either *(int*)&f or -// *reinterpret_cast(&f). And it is particularly true for conversions -// between integral lvalues and floating-point lvalues. -// -// The purpose of this paragraph is to allow optimizing compilers to assume that -// expressions with different types refer to different memory. Compilers are -// known to take advantage of this. So a non-conforming program quietly -// produces wildly incorrect output. -// -// The problem is not the use of reinterpret_cast. The problem is type punning: -// holding an object in memory of one type and reading its bits back using a -// different type. -// -// The C++ standard is more subtle and complex than this, but that is the basic -// idea. -// -// Anyways ... -// -// bit_cast<> calls memcpy() which is blessed by the standard, especially by the -// example in section 3.9 . Also, of course, bit_cast<> wraps up the nasty -// logic in one place. -// -// Fortunately memcpy() is very fast. In optimized mode, compilers replace -// calls to memcpy() with inline object code when the size argument is a -// compile-time constant. On a 32-bit system, memcpy(d,s,4) compiles to one -// load and one store, and memcpy(d,s,8) compiles to two loads and two stores. - -template -inline Dest bit_cast(const Source& source) { - static_assert(sizeof(Dest) == sizeof(Source), - "bit_cast requires source and destination to be the same size"); - -#if (__GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ >= 1) || \ - defined(_LIBCPP_VERSION)) - // GCC 5.1 contains the first libstdc++ with is_trivially_copyable. - // Assume libc++ Just Works: is_trivially_copyable added on May 13th 2011. - static_assert(std::is_trivially_copyable::value, - "non-trivially-copyable bit_cast is undefined"); - static_assert(std::is_trivially_copyable::value, - "non-trivially-copyable bit_cast is undefined"); -#elif HAS_FEATURE(is_trivially_copyable) - // The compiler supports an equivalent intrinsic. - static_assert(__is_trivially_copyable(Dest), - "non-trivially-copyable bit_cast is undefined"); - static_assert(__is_trivially_copyable(Source), - "non-trivially-copyable bit_cast is undefined"); -#elif COMPILER_GCC - // Fallback to compiler intrinsic on GCC and clang (which pretends to be - // GCC). This isn't quite the same as is_trivially_copyable but it'll do for - // our purpose. - static_assert(__has_trivial_copy(Dest), - "non-trivially-copyable bit_cast is undefined"); - static_assert(__has_trivial_copy(Source), - "non-trivially-copyable bit_cast is undefined"); -#else - // Do nothing, let the bots handle it. -#endif - - Dest dest; - memcpy(&dest, &source, sizeof(dest)); - return dest; -} - -#endif // MINI_CHROMIUM_BASE_BIT_CAST_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h deleted file mode 100644 index 73c02ea5fd..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/compiler_specific.h +++ /dev/null @@ -1,91 +0,0 @@ -// Copyright 2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_ -#define MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_ - -#include "build/build_config.h" - -#if defined(COMPILER_MSVC) - -// MSVC_SUPPRESS_WARNING disables warning |n| for the remainder of the line and -// for the next line of the source file. -#define MSVC_SUPPRESS_WARNING(n) __pragma(warning(suppress:n)) - -// MSVC_PUSH_DISABLE_WARNING pushes |n| onto a stack of warnings to be disabled. -// The warning remains disabled until popped by MSVC_POP_WARNING. -#define MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ - __pragma(warning(disable:n)) - -// Pop effects of innermost MSVC_PUSH_* macro. -#define MSVC_POP_WARNING() __pragma(warning(pop)) - -#else // Not MSVC - -#define MSVC_SUPPRESS_WARNING(n) -#define MSVC_PUSH_DISABLE_WARNING(n) -#define MSVC_POP_WARNING() - -#endif // COMPILER_MSVC - -// Annotate a variable indicating it's ok if the variable is not used. -// (Typically used to silence a compiler warning when the assignment -// is important for some other reason.) -// Use like: -// int x = ...; -// ALLOW_UNUSED_LOCAL(x); -#define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0 - -// Annotate a typedef or function indicating it's ok if it's not used. -// Use like: -// typedef Foo Bar ALLOW_UNUSED_TYPE; -#if defined(COMPILER_GCC) -#define ALLOW_UNUSED_TYPE __attribute__((unused)) -#else -#define ALLOW_UNUSED_TYPE -#endif - -// Specify memory alignment for structs, classes, etc. -// Use like: -// class ALIGNAS(16) MyClass { ... } -// ALIGNAS(16) int array[4]; -#if defined(COMPILER_MSVC) -#define ALIGNAS(byte_alignment) __declspec(align(byte_alignment)) -#elif defined(COMPILER_GCC) -#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment))) -#endif - -// Return the byte alignment of the given type (available at compile time). Use -// sizeof(type) prior to checking __alignof to workaround Visual C++ bug: -// http://goo.gl/isH0C -// Use like: -// ALIGNOF(int32_t) // this would be 4 -#if defined(COMPILER_MSVC) -#define ALIGNOF(type) (sizeof(type) - sizeof(type) + __alignof(type)) -#elif defined(COMPILER_GCC) -#define ALIGNOF(type) __alignof__(type) -#endif - -#if defined(COMPILER_MSVC) -#define WARN_UNUSED_RESULT -#else -#define WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#endif - -#if defined(COMPILER_MSVC) -#define PRINTF_FORMAT(format_param, dots_param) -#else -#define PRINTF_FORMAT(format_param, dots_param) \ - __attribute__((format(printf, format_param, dots_param))) -#endif - -// Compiler feature-detection. -// clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension -#if defined(__has_feature) -#define HAS_FEATURE(FEATURE) __has_feature(FEATURE) -#else -#define HAS_FEATURE(FEATURE) 0 -#endif - -#endif // MINI_CHROMIUM_BASE_COMPILER_SPECIFIC_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h deleted file mode 100644 index 0ac91bf873..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_path.h +++ /dev/null @@ -1,244 +0,0 @@ -// Copyright 2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// FilePath is a container for pathnames stored in a platform's native string -// type, providing containers for manipulation in according with the -// platform's conventions for pathnames. It supports the following path -// types: -// -// POSIX Windows -// --------------- ---------------------------------- -// Fundamental type char[] wchar_t[] -// Encoding unspecified* UTF-16 -// Separator / \, tolerant of / -// Drive letters no case-insensitive A-Z followed by : -// Alternate root // (surprise!) \\, for UNC paths -// -// * The encoding need not be specified on POSIX systems, although some -// POSIX-compliant systems do specify an encoding. Mac OS X uses UTF-8. -// Chrome OS also uses UTF-8. -// Linux does not specify an encoding, but in practice, the locale's -// character set may be used. -// -// For more arcane bits of path trivia, see below. -// -// FilePath objects are intended to be used anywhere paths are. An -// application may pass FilePath objects around internally, masking the -// underlying differences between systems, only differing in implementation -// where interfacing directly with the system. For example, a single -// OpenFile(const FilePath &) function may be made available, allowing all -// callers to operate without regard to the underlying implementation. On -// POSIX-like platforms, OpenFile might wrap fopen, and on Windows, it might -// wrap _wfopen_s, perhaps both by calling file_path.value().c_str(). This -// allows each platform to pass pathnames around without requiring conversions -// between encodings, which has an impact on performance, but more imporantly, -// has an impact on correctness on platforms that do not have well-defined -// encodings for pathnames. -// -// Several methods are available to perform common operations on a FilePath -// object, such as determining the parent directory (DirName), isolating the -// final path component (BaseName), and appending a relative pathname string -// to an existing FilePath object (Append). These methods are highly -// recommended over attempting to split and concatenate strings directly. -// These methods are based purely on string manipulation and knowledge of -// platform-specific pathname conventions, and do not consult the filesystem -// at all, making them safe to use without fear of blocking on I/O operations. -// These methods do not function as mutators but instead return distinct -// instances of FilePath objects, and are therefore safe to use on const -// objects. The objects themselves are safe to share between threads. -// -// To aid in initialization of FilePath objects from string literals, a -// FILE_PATH_LITERAL macro is provided, which accounts for the difference -// between char[]-based pathnames on POSIX systems and wchar_t[]-based -// pathnames on Windows. -// -// Paths can't contain NULs as a precaution agaist premature truncation. -// -// Because a FilePath object should not be instantiated at the global scope, -// instead, use a FilePath::CharType[] and initialize it with -// FILE_PATH_LITERAL. At runtime, a FilePath object can be created from the -// character array. Example: -// -// | const FilePath::CharType kLogFileName[] = FILE_PATH_LITERAL("log.txt"); -// | -// | void Function() { -// | FilePath log_file_path(kLogFileName); -// | [...] -// | } -// -// WARNING: FilePaths should ALWAYS be displayed with LTR directionality, even -// when the UI language is RTL. This means you always need to pass filepaths -// through base::i18n::WrapPathWithLTRFormatting() before displaying it in the -// RTL UI. -// -// This is a very common source of bugs, please try to keep this in mind. -// -// ARCANE BITS OF PATH TRIVIA -// -// - A double leading slash is actually part of the POSIX standard. Systems -// are allowed to treat // as an alternate root, as Windows does for UNC -// (network share) paths. Most POSIX systems don't do anything special -// with two leading slashes, but FilePath handles this case properly -// in case it ever comes across such a system. FilePath needs this support -// for Windows UNC paths, anyway. -// References: -// The Open Group Base Specifications Issue 7, sections 3.266 ("Pathname") -// and 4.12 ("Pathname Resolution"), available at: -// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_266 -// http://www.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_12 -// -// - Windows treats c:\\ the same way it treats \\. This was intended to -// allow older applications that require drive letters to support UNC paths -// like \\server\share\path, by permitting c:\\server\share\path as an -// equivalent. Since the OS treats these paths specially, FilePath needs -// to do the same. Since Windows can use either / or \ as the separator, -// FilePath treats c://, c:\\, //, and \\ all equivalently. -// Reference: -// The Old New Thing, "Why is a drive letter permitted in front of UNC -// paths (sometimes)?", available at: -// http://blogs.msdn.com/oldnewthing/archive/2005/11/22/495740.aspx - -#ifndef MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_ -#define MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_ - -#include - -#include -#include - -#include "base/compiler_specific.h" -#include "build/build_config.h" - -// Windows-style drive letter support and pathname separator characters can be -// enabled and disabled independently, to aid testing. These #defines are -// here so that the same setting can be used in both the implementation and -// in the unit test. -#if defined(OS_WIN) -#define FILE_PATH_USES_DRIVE_LETTERS -#define FILE_PATH_USES_WIN_SEPARATORS -#endif // OS_WIN - -namespace base { - -// An abstraction to isolate users from the differences between native -// pathnames on different platforms. -class FilePath { - public: -#if defined(OS_POSIX) - // On most platforms, native pathnames are char arrays, and the encoding - // may or may not be specified. On Mac OS X, native pathnames are encoded - // in UTF-8. - typedef std::string StringType; -#elif defined(OS_WIN) - // On Windows, for Unicode-aware applications, native pathnames are wchar_t - // arrays encoded in UTF-16. - typedef std::wstring StringType; -#endif // OS_WIN - - typedef StringType::value_type CharType; - - // Null-terminated array of separators used to separate components in - // hierarchical paths. Each character in this array is a valid separator, - // but kSeparators[0] is treated as the canonical separator and will be used - // when composing pathnames. - static const CharType kSeparators[]; - - // A special path component meaning "this directory." - static const CharType kCurrentDirectory[]; - - // A special path component meaning "the parent directory." - static const CharType kParentDirectory[]; - - // The character used to identify a file extension. - static const CharType kExtensionSeparator; - - FilePath(); - FilePath(const FilePath& that); - explicit FilePath(const StringType& path); - ~FilePath(); - FilePath& operator=(const FilePath& that); - - bool operator==(const FilePath& that) const; - - bool operator!=(const FilePath& that) const; - - // Required for some STL containers and operations - bool operator<(const FilePath& that) const { - return path_ < that.path_; - } - - const StringType& value() const { return path_; } - - bool empty() const { return path_.empty(); } - - void clear() { path_.clear(); } - - // Returns true if |character| is in kSeparators. - static bool IsSeparator(CharType character); - - // Returns a FilePath corresponding to the directory containing the path - // named by this object, stripping away the file component. If this object - // only contains one component, returns a FilePath identifying - // kCurrentDirectory. If this object already refers to the root directory, - // returns a FilePath identifying the root directory. - FilePath DirName() const WARN_UNUSED_RESULT; - - // Returns a FilePath corresponding to the last path component of this - // object, either a file or a directory. If this object already refers to - // the root directory, returns a FilePath identifying the root directory; - // this is the only situation in which BaseName will return an absolute path. - FilePath BaseName() const WARN_UNUSED_RESULT; - - // Returns the path's file extension. This does not have a special case for - // common double extensions, so FinalExtension() of "foo.tar.gz" is simply - // ".gz". If there is no extension, "" will be returned. - StringType FinalExtension() const WARN_UNUSED_RESULT; - - // Returns a FilePath with FinalExtension() removed. - FilePath RemoveFinalExtension() const WARN_UNUSED_RESULT; - - // Returns a FilePath by appending a separator and the supplied path - // component to this object's path. Append takes care to avoid adding - // excessive separators if this object's path already ends with a separator. - // If this object's path is kCurrentDirectory, a new FilePath corresponding - // only to |component| is returned. |component| must be a relative path; - // it is an error to pass an absolute path. - FilePath Append(const StringType& component) const WARN_UNUSED_RESULT; - FilePath Append(const FilePath& component) const WARN_UNUSED_RESULT; - - // Returns true if this FilePath contains an absolute path. On Windows, an - // absolute path begins with either a drive letter specification followed by - // a separator character, or with two separator characters. On POSIX - // platforms, an absolute path begins with a separator character. - bool IsAbsolute() const; - - private: - // Remove trailing separators from this object. If the path is absolute, it - // will never be stripped any more than to refer to the absolute root - // directory, so "////" will become "/", not "". A leading pair of - // separators is never stripped, to support alternate roots. This is used to - // support UNC paths on Windows. - void StripTrailingSeparatorsInternal(); - - StringType path_; -}; - -} // namespace base - -// This is required by googletest to print a readable output on test failures. -extern void PrintTo(const base::FilePath& path, std::ostream* out); - -// Macros for string literal initialization of FilePath::CharType[], and for -// using a FilePath::CharType[] in a printf-style format string. -#if defined(OS_POSIX) -#define FILE_PATH_LITERAL(x) x -#define PRFilePath "s" -#define PRFilePathLiteral "%s" -#elif defined(OS_WIN) -#define FILE_PATH_LITERAL(x) L ## x -#define PRFilePath "ls" -#define PRFilePathLiteral L"%ls" -#endif // OS_WIN - -#endif // MINI_CHROMIUM_BASE_FILES_FILE_PATH_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h deleted file mode 100644 index 312525176b..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/file_util.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_ -#define MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_ - -#include "build/build_config.h" - -#if defined(OS_POSIX) - -#include - -namespace base { - -bool ReadFromFD(int fd, char* buffer, size_t bytes); - -} // namespace base - -#endif // OS_POSIX - -#endif // MINI_CHROMIUM_BASE_FILES_FILE_UTIL_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h deleted file mode 100644 index 462f561386..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/files/scoped_file.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_ -#define MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_ - -#include - -#include - -#include "base/scoped_generic.h" -#include "build/build_config.h" - -namespace base { - -namespace internal { - -#if defined(OS_POSIX) -struct ScopedFDCloseTraits { - static int InvalidValue() { - return -1; - } - static void Free(int fd); -}; -#endif // OS_POSIX - -struct ScopedFILECloser { - void operator()(FILE* file) const; -}; - -} // namespace internal - -#if defined(OS_POSIX) -typedef ScopedGeneric ScopedFD; -#endif // OS_POSIX -typedef std::unique_ptr ScopedFILE; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_FILES_SCOPED_FILE_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h deleted file mode 100644 index 4d90c593a6..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/format_macros.h +++ /dev/null @@ -1,101 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef BASE_FORMAT_MACROS_H_ -#define BASE_FORMAT_MACROS_H_ - -// This file defines the format macros for some integer types. - -// To print a 64-bit value in a portable way: -// int64_t value; -// printf("xyz:%" PRId64, value); -// The "d" in the macro corresponds to %d; you can also use PRIu64 etc. -// -// For wide strings, prepend "Wide" to the macro: -// int64_t value; -// StringPrintf(L"xyz: %" WidePRId64, value); -// -// To print a size_t value in a portable way: -// size_t size; -// printf("xyz: %" PRIuS, size); -// The "u" in the macro corresponds to %u, and S is for "size". - -#include "build/build_config.h" - -#if defined(OS_POSIX) - -#if (defined(_INTTYPES_H) || defined(_INTTYPES_H_)) && !defined(PRId64) -#error "inttypes.h has already been included before this header file, but " -#error "without __STDC_FORMAT_MACROS defined." -#endif - -#if !defined(__STDC_FORMAT_MACROS) -#define __STDC_FORMAT_MACROS -#endif - -#include - -// GCC will concatenate wide and narrow strings correctly, so nothing needs to -// be done here. -#define WidePRId64 PRId64 -#define WidePRIu64 PRIu64 -#define WidePRIx64 PRIx64 - -#if !defined(PRIuS) -#define PRIuS "zu" -#endif - -// The size of NSInteger and NSUInteger varies between 32-bit and 64-bit -// architectures and Apple does not provides standard format macros and -// recommends casting. This has many drawbacks, so instead define macros -// for formatting those types. -#if defined(OS_MACOSX) -#if defined(ARCH_CPU_64_BITS) -#if !defined(PRIdNS) -#define PRIdNS "ld" -#endif -#if !defined(PRIuNS) -#define PRIuNS "lu" -#endif -#if !defined(PRIxNS) -#define PRIxNS "lx" -#endif -#else // defined(ARCH_CPU_64_BITS) -#if !defined(PRIdNS) -#define PRIdNS "d" -#endif -#if !defined(PRIuNS) -#define PRIuNS "u" -#endif -#if !defined(PRIxNS) -#define PRIxNS "x" -#endif -#endif -#endif // defined(OS_MACOSX) - -#else // OS_WIN - -#if !defined(PRId64) -#define PRId64 "I64d" -#endif - -#if !defined(PRIu64) -#define PRIu64 "I64u" -#endif - -#if !defined(PRIx64) -#define PRIx64 "I64x" -#endif - -#define WidePRId64 L"I64d" -#define WidePRIu64 L"I64u" -#define WidePRIx64 L"I64x" - -#if !defined(PRIuS) -#define PRIuS "Iu" -#endif - -#endif - -#endif // BASE_FORMAT_MACROS_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h deleted file mode 100644 index 37bf23be86..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/logging.h +++ /dev/null @@ -1,353 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_LOGGING_H_ -#define MINI_CHROMIUM_BASE_LOGGING_H_ - -#include -#include - -#include -#include -#include - -#include "base/macros.h" -#include "build/build_config.h" - -namespace logging { - -typedef int LogSeverity; -const LogSeverity LOG_VERBOSE = -1; -const LogSeverity LOG_INFO = 0; -const LogSeverity LOG_WARNING = 1; -const LogSeverity LOG_ERROR = 2; -const LogSeverity LOG_ERROR_REPORT = 3; -const LogSeverity LOG_FATAL = 4; -const LogSeverity LOG_NUM_SEVERITIES = 5; - -#if defined(NDEBUG) -const LogSeverity LOG_DFATAL = LOG_ERROR; -#else -const LogSeverity LOG_DFATAL = LOG_FATAL; -#endif - -typedef bool (*LogMessageHandlerFunction)(LogSeverity severity, - const char* file_poath, - int line, - size_t message_start, - const std::string& string); - -void SetLogMessageHandler(LogMessageHandlerFunction log_message_handler); -LogMessageHandlerFunction GetLogMessageHandler(); - -static inline int GetMinLogLevel() { - return LOG_INFO; -} - -static inline int GetVlogLevel(const char*) { - return std::numeric_limits::max(); -} - -#if defined(OS_WIN) -// This is just ::GetLastError, but out-of-line to avoid including windows.h in -// such a widely used place. -unsigned long GetLastSystemErrorCode(); -std::string SystemErrorCodeToString(unsigned long error_code); -#elif defined(OS_POSIX) -static inline int GetLastSystemErrorCode() { - return errno; -} -#endif - -template -std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) { - std::ostringstream ss; - ss << names << " (" << v1 << " vs. " << v2 << ")"; - std::string* msg = new std::string(ss.str()); - return msg; -} - -#define DEFINE_CHECK_OP_IMPL(name, op) \ - template \ - inline std::string* Check ## name ## Impl(const t1& v1, const t2& v2, \ - const char* names) { \ - if (v1 op v2) { \ - return NULL; \ - } else { \ - return MakeCheckOpString(v1, v2, names); \ - } \ - } \ - inline std::string* Check ## name ## Impl(int v1, int v2, \ - const char* names) { \ - if (v1 op v2) { \ - return NULL; \ - } else { \ - return MakeCheckOpString(v1, v2, names); \ - } \ - } - -DEFINE_CHECK_OP_IMPL(EQ, ==) -DEFINE_CHECK_OP_IMPL(NE, !=) -DEFINE_CHECK_OP_IMPL(LE, <=) -DEFINE_CHECK_OP_IMPL(LT, <) -DEFINE_CHECK_OP_IMPL(GE, >=) -DEFINE_CHECK_OP_IMPL(GT, >) - -#undef DEFINE_CHECK_OP_IMPL - -class LogMessage { - public: - LogMessage(const char* function, - const char* file_path, - int line, - LogSeverity severity); - LogMessage(const char* function, - const char* file_path, - int line, - std::string* result); - ~LogMessage(); - - std::ostream& stream() { return stream_; } - - private: - void Init(const char* function); - - std::ostringstream stream_; - const char* file_path_; - size_t message_start_; - const int line_; - LogSeverity severity_; - - DISALLOW_COPY_AND_ASSIGN(LogMessage); -}; - -class LogMessageVoidify { - public: - LogMessageVoidify() {} - - void operator&(const std::ostream&) const {} -}; - -#if defined(OS_WIN) -class Win32ErrorLogMessage : public LogMessage { - public: - Win32ErrorLogMessage(const char* function, - const char* file_path, - int line, - LogSeverity severity, - unsigned long err); - ~Win32ErrorLogMessage(); - - private: - unsigned long err_; - - DISALLOW_COPY_AND_ASSIGN(Win32ErrorLogMessage); -}; -#elif defined(OS_POSIX) -class ErrnoLogMessage : public LogMessage { - public: - ErrnoLogMessage(const char* function, - const char* file_path, - int line, - LogSeverity severity, - int err); - ~ErrnoLogMessage(); - - private: - int err_; - - DISALLOW_COPY_AND_ASSIGN(ErrnoLogMessage); -}; -#endif - -} // namespace logging - -#if defined(COMPILER_MSVC) -#define FUNCTION_SIGNATURE __FUNCSIG__ -#else -#define FUNCTION_SIGNATURE __PRETTY_FUNCTION__ -#endif - -#define COMPACT_GOOGLE_LOG_EX_INFO(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_INFO, ## __VA_ARGS__) -#define COMPACT_GOOGLE_LOG_EX_WARNING(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_WARNING, ## __VA_ARGS__) -#define COMPACT_GOOGLE_LOG_EX_ERROR(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_ERROR, ## __VA_ARGS__) -#define COMPACT_GOOGLE_LOG_EX_ERROR_REPORT(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_ERROR_REPORT, ## __VA_ARGS__) -#define COMPACT_GOOGLE_LOG_EX_FATAL(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_FATAL, ## __VA_ARGS__) -#define COMPACT_GOOGLE_LOG_EX_DFATAL(ClassName, ...) \ - logging::ClassName(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - logging::LOG_DFATAL, ## __VA_ARGS__) - -#define COMPACT_GOOGLE_LOG_INFO \ - COMPACT_GOOGLE_LOG_EX_INFO(LogMessage) -#define COMPACT_GOOGLE_LOG_WARNING \ - COMPACT_GOOGLE_LOG_EX_WARNING(LogMessage) -#define COMPACT_GOOGLE_LOG_ERROR \ - COMPACT_GOOGLE_LOG_EX_ERROR(LogMessage) -#define COMPACT_GOOGLE_LOG_ERROR_REPORT \ - COMPACT_GOOGLE_LOG_EX_ERROR_REPORT(LogMessage) -#define COMPACT_GOOGLE_LOG_FATAL \ - COMPACT_GOOGLE_LOG_EX_FATAL(LogMessage) -#define COMPACT_GOOGLE_LOG_DFATAL \ - COMPACT_GOOGLE_LOG_EX_DFATAL(LogMessage) - -#if defined(OS_WIN) - -// wingdi.h defines ERROR 0. We don't want to include windows.h here, and we -// want to allow "LOG(ERROR)", which will expand to LOG_0. - -// This will not cause a warning if the RHS text is identical to that in -// wingdi.h (which it is). -#define ERROR 0 - -#define COMPACT_GOOGLE_LOG_EX_0(ClassName, ...) \ - COMPACT_GOOGLE_LOG_EX_ERROR(ClassName , ##__VA_ARGS__) -#define COMPACT_GOOGLE_LOG_0 COMPACT_GOOGLE_LOG_ERROR -namespace logging { -const LogSeverity LOG_0 = LOG_ERROR; -} // namespace logging - -#endif // OS_WIN - -#define LAZY_STREAM(stream, condition) \ - !(condition) ? (void) 0 : ::logging::LogMessageVoidify() & (stream) - -#define LOG_IS_ON(severity) \ - ((::logging::LOG_ ## severity) >= ::logging::GetMinLogLevel()) -#define VLOG_IS_ON(verbose_level) \ - ((verbose_level) <= ::logging::GetVlogLevel(__FILE__)) - -#define LOG_STREAM(severity) COMPACT_GOOGLE_LOG_ ## severity.stream() -#define VLOG_STREAM(verbose_level) \ - logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - -verbose_level).stream() - -#if defined(OS_WIN) -#define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \ - Win32ErrorLogMessage, ::logging::GetLastSystemErrorCode()).stream() -#define VPLOG_STREAM(verbose_level) \ - logging::Win32ErrorLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - -verbose_level, \ - ::logging::GetLastSystemErrorCode()).stream() -#elif defined(OS_POSIX) -#define PLOG_STREAM(severity) COMPACT_GOOGLE_LOG_EX_ ## severity( \ - ErrnoLogMessage, ::logging::GetLastSystemErrorCode()).stream() -#define VPLOG_STREAM(verbose_level) \ - logging::ErrnoLogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - -verbose_level, \ - ::logging::GetLastSystemErrorCode()).stream() -#endif - -#define LOG(severity) LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity)) -#define LOG_IF(severity, condition) \ - LAZY_STREAM(LOG_STREAM(severity), LOG_IS_ON(severity) && (condition)) -#define LOG_ASSERT(condition) \ - LOG_IF(FATAL, !(condition)) << "Assertion failed: " # condition ". " - -#define VLOG(verbose_level) \ - LAZY_STREAM(VLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level)) -#define VLOG_IF(verbose_level, condition) \ - LAZY_STREAM(VLOG_STREAM(verbose_level), \ - VLOG_IS_ON(verbose_level) && (condition)) - -#define PLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity)) -#define PLOG_IF(severity, condition) \ - LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity) && (condition)) - -#define VPLOG(verbose_level) \ - LAZY_STREAM(VPLOG_STREAM(verbose_level), VLOG_IS_ON(verbose_level)) -#define VPLOG_IF(verbose_level, condition) \ - LAZY_STREAM(VPLOG_STREAM(verbose_level), \ - VLOG_IS_ON(verbose_level) && (condition)) - -#define CHECK(condition) \ - LAZY_STREAM(LOG_STREAM(FATAL), !(condition)) \ - << "Check failed: " # condition << ". " -#define PCHECK(condition) \ - LAZY_STREAM(PLOG_STREAM(FATAL), !(condition)) \ - << "Check failed: " # condition << ". " - -#define CHECK_OP(name, op, val1, val2) \ - if (std::string* _result = \ - logging::Check ## name ## Impl((val1), (val2), \ - # val1 " " # op " " # val2)) \ - logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - _result).stream() - -#define CHECK_EQ(val1, val2) CHECK_OP(EQ, ==, val1, val2) -#define CHECK_NE(val1, val2) CHECK_OP(NE, !=, val1, val2) -#define CHECK_LE(val1, val2) CHECK_OP(LE, <=, val1, val2) -#define CHECK_LT(val1, val2) CHECK_OP(LT, <, val1, val2) -#define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2) -#define CHECK_GT(val1, val2) CHECK_OP(GT, >, val1, val2) - -#if defined(NDEBUG) -#define DLOG_IS_ON(severity) 0 -#define DVLOG_IS_ON(verbose_level) 0 -#define DCHECK_IS_ON() 0 -#else -#define DLOG_IS_ON(severity) LOG_IS_ON(severity) -#define DVLOG_IS_ON(verbose_level) VLOG_IS_ON(verbose_level) -#define DCHECK_IS_ON() 1 -#endif - -#define DLOG(severity) LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity)) -#define DLOG_IF(severity, condition) \ - LAZY_STREAM(LOG_STREAM(severity), DLOG_IS_ON(severity) && (condition)) -#define DLOG_ASSERT(condition) \ - DLOG_IF(FATAL, !(condition)) << "Assertion failed: " # condition ". " - -#define DVLOG(verbose_level) \ - LAZY_STREAM(VLOG_STREAM(verbose_level), DVLOG_IS_ON(verbose_level)) -#define DVLOG_IF(verbose_level, condition) \ - LAZY_STREAM(VLOG_STREAM(verbose_level), \ - DVLOG_IS_ON(verbose_level) && (condition)) - -#define DPLOG(severity) LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity)) -#define DPLOG_IF(severity, condition) \ - LAZY_STREAM(PLOG_STREAM(severity), DLOG_IS_ON(severity) && (condition)) - -#define DVPLOG(verbose_level) \ - LAZY_STREAM(VPLOG_STREAM(verbose_level), DVLOG_IS_ON(verbose_level)) -#define DVPLOG_IF(verbose_level, condition) \ - LAZY_STREAM(VPLOG_STREAM(verbose_level), \ - DVLOG_IS_ON(verbose_level) && (condition)) - -#define DCHECK(condition) \ - LAZY_STREAM(LOG_STREAM(FATAL), DCHECK_IS_ON() ? !(condition) : false) \ - << "Check failed: " # condition << ". " -#define DPCHECK(condition) \ - LAZY_STREAM(PLOG_STREAM(FATAL), DCHECK_IS_ON() ? !(condition) : false) \ - << "Check failed: " # condition << ". " - -#define DCHECK_OP(name, op, val1, val2) \ - if (DCHECK_IS_ON()) \ - if (std::string* _result = \ - logging::Check ## name ## Impl((val1), (val2), \ - # val1 " " # op " " # val2)) \ - logging::LogMessage(FUNCTION_SIGNATURE, __FILE__, __LINE__, \ - _result).stream() - -#define DCHECK_EQ(val1, val2) DCHECK_OP(EQ, ==, val1, val2) -#define DCHECK_NE(val1, val2) DCHECK_OP(NE, !=, val1, val2) -#define DCHECK_LE(val1, val2) DCHECK_OP(LE, <=, val1, val2) -#define DCHECK_LT(val1, val2) DCHECK_OP(LT, <, val1, val2) -#define DCHECK_GE(val1, val2) DCHECK_OP(GE, >=, val1, val2) -#define DCHECK_GT(val1, val2) DCHECK_OP(GT, >, val1, val2) - -#define NOTREACHED() DCHECK(false) - -#undef assert -#define assert(condition) DLOG_ASSERT(condition) - -#endif // MINI_CHROMIUM_BASE_LOGGING_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h deleted file mode 100644 index 9291ac7c1c..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/foundation_util.h +++ /dev/null @@ -1,181 +0,0 @@ -// Copyright 2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_ -#define MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_ - -#include - -#include "base/logging.h" - -#if defined(__OBJC__) -#import -#else // defined(__OBJC__) -#include -#endif // defined(__OBJC__) - -#if !defined(__OBJC__) -#define OBJC_CPP_CLASS_DECL(x) class x; -#else // defined(__OBJC__) -#define OBJC_CPP_CLASS_DECL(x) -#endif // defined(__OBJC__) - -// Convert toll-free bridged CFTypes to NSTypes and vice-versa. This does not -// autorelease |cf_val|. This is useful for the case where there is a CFType in -// a call that expects an NSType and the compiler is complaining about const -// casting problems. -// The calls are used like this: -// NSString *foo = CFToNSCast(CFSTR("Hello")); -// CFStringRef foo2 = NSToCFCast(@"Hello"); -// The macro magic below is to enforce safe casting. It could possibly have -// been done using template function specialization, but template function -// specialization doesn't always work intuitively, -// (http://www.gotw.ca/publications/mill17.htm) so the trusty combination -// of macros and function overloading is used instead. - -#define CF_TO_NS_CAST_DECL(TypeCF, TypeNS) \ -OBJC_CPP_CLASS_DECL(TypeNS) \ -\ -namespace base { \ -namespace mac { \ -TypeNS* CFToNSCast(TypeCF##Ref cf_val); \ -TypeCF##Ref NSToCFCast(TypeNS* ns_val); \ -} \ -} -#define CF_TO_NS_MUTABLE_CAST_DECL(name) \ -CF_TO_NS_CAST_DECL(CF##name, NS##name) \ -OBJC_CPP_CLASS_DECL(NSMutable##name) \ -\ -namespace base { \ -namespace mac { \ -NSMutable##name* CFToNSCast(CFMutable##name##Ref cf_val); \ -CFMutable##name##Ref NSToCFCast(NSMutable##name* ns_val); \ -} \ -} - -// List of toll-free bridged types taken from: -// http://www.cocoadev.com/index.pl?TollFreeBridged - -CF_TO_NS_MUTABLE_CAST_DECL(Array); -CF_TO_NS_MUTABLE_CAST_DECL(AttributedString); -CF_TO_NS_CAST_DECL(CFCalendar, NSCalendar); -CF_TO_NS_MUTABLE_CAST_DECL(CharacterSet); -CF_TO_NS_MUTABLE_CAST_DECL(Data); -CF_TO_NS_CAST_DECL(CFDate, NSDate); -CF_TO_NS_MUTABLE_CAST_DECL(Dictionary); -CF_TO_NS_CAST_DECL(CFError, NSError); -CF_TO_NS_CAST_DECL(CFLocale, NSLocale); -CF_TO_NS_CAST_DECL(CFNumber, NSNumber); -CF_TO_NS_CAST_DECL(CFRunLoopTimer, NSTimer); -CF_TO_NS_CAST_DECL(CFTimeZone, NSTimeZone); -CF_TO_NS_MUTABLE_CAST_DECL(Set); -CF_TO_NS_CAST_DECL(CFReadStream, NSInputStream); -CF_TO_NS_CAST_DECL(CFWriteStream, NSOutputStream); -CF_TO_NS_MUTABLE_CAST_DECL(String); -CF_TO_NS_CAST_DECL(CFURL, NSURL); - -#undef CF_TO_NS_CAST_DECL -#undef CF_TO_NS_MUTABLE_CAST_DECL -#undef OBJC_CPP_CLASS_DECL - -namespace base { -namespace mac { - -// CFCast<>() and CFCastStrict<>() cast a basic CFTypeRef to a more -// specific CoreFoundation type. The compatibility of the passed -// object is found by comparing its opaque type against the -// requested type identifier. If the supplied object is not -// compatible with the requested return type, CFCast<>() returns -// NULL and CFCastStrict<>() will DCHECK. Providing a NULL pointer -// to either variant results in NULL being returned without -// triggering any DCHECK. -// -// Example usage: -// CFNumberRef some_number = base::mac::CFCast( -// CFArrayGetValueAtIndex(array, index)); -// -// CFTypeRef hello = CFSTR("hello world"); -// CFStringRef some_string = base::mac::CFCastStrict(hello); - -template -T CFCast(const CFTypeRef& cf_val); - -template -T CFCastStrict(const CFTypeRef& cf_val); - -#define CF_CAST_DECL(TypeCF) \ -template<> TypeCF##Ref \ -CFCast(const CFTypeRef& cf_val);\ -\ -template<> TypeCF##Ref \ -CFCastStrict(const CFTypeRef& cf_val); - -CF_CAST_DECL(CFArray); -CF_CAST_DECL(CFBag); -CF_CAST_DECL(CFBoolean); -CF_CAST_DECL(CFData); -CF_CAST_DECL(CFDate); -CF_CAST_DECL(CFDictionary); -CF_CAST_DECL(CFNull); -CF_CAST_DECL(CFNumber); -CF_CAST_DECL(CFSet); -CF_CAST_DECL(CFString); -CF_CAST_DECL(CFURL); -CF_CAST_DECL(CFUUID); - -CF_CAST_DECL(CGColor); - -CF_CAST_DECL(CTFont); -CF_CAST_DECL(CTRun); - -CF_CAST_DECL(SecACL); -CF_CAST_DECL(SecTrustedApplication); - -#undef CF_CAST_DECL - -#if defined(__OBJC__) - -// ObjCCast<>() and ObjCCastStrict<>() cast a basic id to a more -// specific (NSObject-derived) type. The compatibility of the passed -// object is found by checking if it's a kind of the requested type -// identifier. If the supplied object is not compatible with the -// requested return type, ObjCCast<>() returns nil and -// ObjCCastStrict<>() will DCHECK. Providing a nil pointer to either -// variant results in nil being returned without triggering any DCHECK. -// -// The strict variant is useful when retrieving a value from a -// collection which only has values of a specific type, e.g. an -// NSArray of NSStrings. The non-strict variant is useful when -// retrieving values from data that you can't fully control. For -// example, a plist read from disk may be beyond your exclusive -// control, so you'd only want to check that the values you retrieve -// from it are of the expected types, but not crash if they're not. -// -// Example usage: -// NSString* version = base::mac::ObjCCast( -// [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]); -// -// NSString* str = base::mac::ObjCCastStrict( -// [ns_arr_of_ns_strs objectAtIndex:0]); -template -T* ObjCCast(id objc_val) { - if ([objc_val isKindOfClass:[T class]]) { - return reinterpret_cast(objc_val); - } - return nil; -} - -template -T* ObjCCastStrict(id objc_val) { - T* rv = ObjCCast(objc_val); - DCHECK(objc_val == nil || rv); - return rv; -} - -#endif // defined(__OBJC__) - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_FOUNDATION_UTIL_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h deleted file mode 100644 index e5bd1f6381..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/mach_logging.h +++ /dev/null @@ -1,155 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_ -#define MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_ - -#include - -#include "base/logging.h" -#include "base/macros.h" - -// Use the MACH_LOG family of macros along with a mach_error_t (kern_return_t) -// containing a Mach error. The error value will be decoded so that logged -// messages explain the error. -// -// Use the BOOTSTRAP_LOG family of macros specifically for errors that occur -// while interoperating with the bootstrap subsystem. These errors will first -// be looked up as bootstrap error messages. If no match is found, they will -// be treated as generic Mach errors, as in MACH_LOG. -// -// Examples: -// -// kern_return_t kr = mach_timebase_info(&info); -// if (kr != KERN_SUCCESS) { -// MACH_LOG(ERROR, kr) << "mach_timebase_info"; -// } -// -// kr = vm_deallocate(task, address, size); -// MACH_DCHECK(kr == KERN_SUCCESS, kr) << "vm_deallocate"; - -namespace logging { - -class MachLogMessage : public logging::LogMessage { - public: - MachLogMessage(const char* function, - const char* file_path, - int line, - LogSeverity severity, - mach_error_t mach_err); - ~MachLogMessage(); - - private: - mach_error_t mach_err_; - - DISALLOW_COPY_AND_ASSIGN(MachLogMessage); -}; - -} // namespace logging - -#define MACH_LOG_STREAM(severity, mach_err) \ - COMPACT_GOOGLE_LOG_EX_ ## severity(MachLogMessage, mach_err).stream() -#define MACH_VLOG_STREAM(verbose_level, mach_err) \ - logging::MachLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \ - -verbose_level, mach_err).stream() - -#define MACH_LOG(severity, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), LOG_IS_ON(severity)) -#define MACH_LOG_IF(severity, condition, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \ - LOG_IS_ON(severity) && (condition)) - -#define MACH_VLOG(verbose_level, mach_err) \ - LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ - VLOG_IS_ON(verbose_level)) -#define MACH_VLOG_IF(verbose_level, condition, mach_err) \ - LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ - VLOG_IS_ON(verbose_level) && (condition)) - -#define MACH_CHECK(condition, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), !(condition)) \ - << "Check failed: " # condition << ". " - -#define MACH_DLOG(severity, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), DLOG_IS_ON(severity)) -#define MACH_DLOG_IF(severity, condition, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(severity, mach_err), \ - DLOG_IS_ON(severity) && (condition)) - -#define MACH_DVLOG(verbose_level, mach_err) \ - LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ - DVLOG_IS_ON(verbose_level)) -#define MACH_DVLOG_IF(verbose_level, condition, mach_err) \ - LAZY_STREAM(MACH_VLOG_STREAM(verbose_level, mach_err), \ - DVLOG_IS_ON(verbose_level) && (condition)) - -#define MACH_DCHECK(condition, mach_err) \ - LAZY_STREAM(MACH_LOG_STREAM(FATAL, mach_err), \ - DCHECK_IS_ON && !(condition)) \ - << "Check failed: " # condition << ". " - -namespace logging { - -class BootstrapLogMessage : public logging::LogMessage { - public: - BootstrapLogMessage(const char* function, - const char* file_path, - int line, - LogSeverity severity, - kern_return_t bootstrap_err); - ~BootstrapLogMessage(); - - private: - kern_return_t bootstrap_err_; - - DISALLOW_COPY_AND_ASSIGN(BootstrapLogMessage); -}; - -} // namespace logging - -#define BOOTSTRAP_LOG_STREAM(severity, bootstrap_err) \ - COMPACT_GOOGLE_LOG_EX_ ## severity(BootstrapLogMessage, \ - bootstrap_err).stream() -#define BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err) \ - logging::BootstrapLogMessage(__PRETTY_FUNCTION__, __FILE__, __LINE__, \ - -verbose_level, bootstrap_err).stream() - -#define BOOTSTRAP_LOG(severity, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, \ - bootstrap_err), LOG_IS_ON(severity)) -#define BOOTSTRAP_LOG_IF(severity, condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ - LOG_IS_ON(severity) && (condition)) - -#define BOOTSTRAP_VLOG(verbose_level, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ - VLOG_IS_ON(verbose_level)) -#define BOOTSTRAP_VLOG_IF(verbose_level, condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ - VLOG_IS_ON(verbose_level) && (condition)) - -#define BOOTSTRAP_CHECK(condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), !(condition)) \ - << "Check failed: " # condition << ". " - -#define BOOTSTRAP_DLOG(severity, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ - DLOG_IS_ON(severity)) -#define BOOTSTRAP_DLOG_IF(severity, condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(severity, bootstrap_err), \ - DLOG_IS_ON(severity) && (condition)) - -#define BOOTSTRAP_DVLOG(verbose_level, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ - DVLOG_IS_ON(verbose_level)) -#define BOOTSTRAP_DVLOG_IF(verbose_level, condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_VLOG_STREAM(verbose_level, bootstrap_err), \ - DVLOG_IS_ON(verbose_level) && (condition)) - -#define BOOTSTRAP_DCHECK(condition, bootstrap_err) \ - LAZY_STREAM(BOOTSTRAP_LOG_STREAM(FATAL, bootstrap_err), \ - DCHECK_IS_ON && !(condition)) \ - << "Check failed: " # condition << ". " - -#endif // MINI_CHROMIUM_BASE_MAC_MACH_LOGGING_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h deleted file mode 100644 index 7ea09219ff..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_cftyperef.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_ - -#include - -#include "base/mac/scoped_typeref.h" - -namespace base { - -namespace internal { - -template -struct ScopedCFTypeRefTraits { - static CFT InvalidValue() { return nullptr; } - static CFT Retain(CFT object) { - CFRetain(object); - return object; - } - static void Release(CFT object) { CFRelease(object); } -}; - -} // namespace internal - -template -using ScopedCFTypeRef = - ScopedTypeRef>; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_CFTYPEREF_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h deleted file mode 100644 index e653110a96..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_ioobject.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_ - -#include - -#include "base/mac/scoped_typeref.h" - -namespace base { -namespace mac { - -namespace internal { - -template -struct ScopedIOObjectTraits { - static IOT InvalidValue() { return IO_OBJECT_NULL; } - static IOT Retain(IOT iot) { - IOObjectRetain(iot); - return iot; - } - static void Release(IOT iot) { IOObjectRelease(iot); } -}; - -} // namespce internal - -template -using ScopedIOObject = ScopedTypeRef>; - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_IOOBJECT_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h deleted file mode 100644 index 8f8e759fc2..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_launch_data.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_ - -#include - -#include "base/scoped_generic.h" - -namespace base { -namespace mac { - -namespace internal { - -struct ScopedLaunchDataTraits { - static launch_data_t InvalidValue() { return nullptr; } - - static void Free(launch_data_t ldt) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - launch_data_free(ldt); -#pragma clang diagnostic pop - } -}; - -} // namespace internal - -using ScopedLaunchData = - ScopedGeneric; - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_LAUNCH_DATA_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h deleted file mode 100644 index f7275edb68..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_port.h +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_ - -#include - -#include "base/scoped_generic.h" - -namespace base { -namespace mac { - -namespace internal { - -struct SendRightTraits { - static mach_port_t InvalidValue() { - return MACH_PORT_NULL; - } - static void Free(mach_port_t port); -}; - -struct ReceiveRightTraits { - static mach_port_t InvalidValue() { - return MACH_PORT_NULL; - } - static void Free(mach_port_t port); -}; - -struct PortSetTraits { - static mach_port_t InvalidValue() { - return MACH_PORT_NULL; - } - static void Free(mach_port_t port); -}; - -} // namespace internal - -using ScopedMachSendRight = - ScopedGeneric; -using ScopedMachReceiveRight = - ScopedGeneric; -using ScopedMachPortSet = ScopedGeneric; - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_PORT_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h deleted file mode 100644 index 89087c733e..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_mach_vm.h +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_ - -#include - -#include - -#include "base/logging.h" -#include "base/macros.h" - -// Use ScopedMachVM to supervise ownership of pages in the current process -// through the Mach VM subsystem. Pages allocated with vm_allocate can be -// released when exiting a scope with ScopedMachVM. -// -// The Mach VM subsystem operates on a page-by-page basis, and a single VM -// allocation managed by a ScopedMachVM object may span multiple pages. As far -// as Mach is concerned, allocated pages may be deallocated individually. This -// is in contrast to higher-level allocators such as malloc, where the base -// address of an allocation implies the size of an allocated block. -// Consequently, it is not sufficient to just pass the base address of an -// allocation to ScopedMachVM, it also needs to know the size of the -// allocation. To avoid any confusion, both the base address and size must -// be page-aligned. -// -// When dealing with Mach VM, base addresses will naturally be page-aligned, -// but user-specified sizes may not be. If there's a concern that a size is -// not page-aligned, use the mach_vm_round_page macro to correct it. -// -// Example: -// -// vm_address_t address = 0; -// vm_size_t size = 12345; // This requested size is not page-aligned. -// kern_return_t kr = -// vm_allocate(mach_task_self(), &address, size, VM_FLAGS_ANYWHERE); -// if (kr != KERN_SUCCESS) { -// return false; -// } -// ScopedMachVM vm_owner(address, mach_vm_round_page(size)); - -namespace base { -namespace mac { - -class ScopedMachVM { - public: - explicit ScopedMachVM(vm_address_t address = 0, vm_size_t size = 0) - : address_(address), - size_(size) { - DCHECK(address % PAGE_SIZE == 0); - DCHECK(size % PAGE_SIZE == 0); - } - - ~ScopedMachVM() { - if (size_) { - vm_deallocate(mach_task_self(), address_, size_); - } - } - - void reset(vm_address_t address = 0, vm_size_t size = 0); - - vm_address_t address() const { - return address_; - } - - vm_size_t size() const { - return size_; - } - - void swap(ScopedMachVM& that) { - std::swap(address_, that.address_); - std::swap(size_, that.size_); - } - - void release() { - address_ = 0; - size_ = 0; - } - - private: - vm_address_t address_; - vm_size_t size_; - - DISALLOW_COPY_AND_ASSIGN(ScopedMachVM); -}; - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_MACH_VM_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h deleted file mode 100644 index c8d9def5d5..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsautorelease_pool.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_ - -#include "base/macros.h" - -#if defined(OS_MACOSX) -#if defined(__OBJC__) -@class NSAutoreleasePool; -#else // __OBJC__ -class NSAutoreleasePool; -#endif // __OBJC__ -#endif // OS_MACOSX - -namespace base { -namespace mac { - -// On the Mac, ScopedNSAutoreleasePool allocates an NSAutoreleasePool when -// instantiated and sends it a -drain message when destroyed. This allows an -// autorelease pool to be maintained in ordinary C++ code without bringing in -// any direct Objective-C dependency. -// -// On other platforms, ScopedNSAutoreleasePool is an empty object with no -// effects. This allows it to be used directly in cross-platform code without -// ugly #ifdefs. -class ScopedNSAutoreleasePool { - public: -#if !defined(OS_MACOSX) - ScopedNSAutoreleasePool() {} - void Recycle() { } -#else // OS_MACOSX - ScopedNSAutoreleasePool(); - ~ScopedNSAutoreleasePool(); - - // Clear out the pool in case its position on the stack causes it to be - // alive for long periods of time (such as the entire length of the app). - // Only use then when you're certain the items currently in the pool are - // no longer needed. - void Recycle(); - private: - NSAutoreleasePool* autorelease_pool_; -#endif // OS_MACOSX - - private: - DISALLOW_COPY_AND_ASSIGN(ScopedNSAutoreleasePool); -}; - -} // namespace mac -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_NSAUTORELEASE_POOL_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h deleted file mode 100644 index 2e157a4a28..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_nsobject.h +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_ - -#import - -#include - -#include "base/compiler_specific.h" -#include "base/mac/scoped_typeref.h" - -namespace base { - -namespace internal { - -template -struct ScopedNSProtocolTraits { - static NST InvalidValue() { return nil; } - static NST Retain(NST nst) { return [nst retain]; } - static void Release(NST nst) { [nst release]; } -}; - -} // namespace internal - -template -class scoped_nsprotocol - : public ScopedTypeRef> { - public: - using ScopedTypeRef>::ScopedTypeRef; - - NST autorelease() { return [this->release() autorelease]; } -}; - -template -void swap(scoped_nsprotocol& p1, scoped_nsprotocol& p2) { - p1.swap(p2); -} - -template -bool operator==(C p1, const scoped_nsprotocol& p2) { - return p1 == p2.get(); -} - -template -bool operator!=(C p1, const scoped_nsprotocol& p2) { - return p1 != p2.get(); -} - -template -class scoped_nsobject : public scoped_nsprotocol { - public: - using scoped_nsprotocol::scoped_nsprotocol; - - static_assert(std::is_same::value == false, - "Use ScopedNSAutoreleasePool instead"); -}; - -template<> -class scoped_nsobject : public scoped_nsprotocol { - public: - using scoped_nsprotocol::scoped_nsprotocol; -}; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_NSOBJECT_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h deleted file mode 100644 index 9f00b1a216..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/mac/scoped_typeref.h +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_ -#define MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_ - -#include "base/compiler_specific.h" -#include "base/logging.h" -#include "base/memory/scoped_policy.h" - -namespace base { - -template -struct ScopedTypeRefTraits; - -template > -class ScopedTypeRef { - public: - typedef T element_type; - - ScopedTypeRef( - T object = Traits::InvalidValue(), - base::scoped_policy::OwnershipPolicy policy = base::scoped_policy::ASSUME) - : object_(object) { - if (object_ && policy == base::scoped_policy::RETAIN) - object_ = Traits::Retain(object_); - } - - ScopedTypeRef(const ScopedTypeRef& that) : object_(that.object_) { - if (object_) - object_ = Traits::Retain(object_); - } - - ~ScopedTypeRef() { - if (object_) - Traits::Release(object_); - } - - ScopedTypeRef& operator=(const ScopedTypeRef& that) { - reset(that.get(), base::scoped_policy::RETAIN); - return *this; - } - - T* InitializeInto() WARN_UNUSED_RESULT { - DCHECK(!object_); - return &object_; - } - - void reset(T object = Traits::InvalidValue(), - base::scoped_policy::OwnershipPolicy policy = - base::scoped_policy::ASSUME) { - if (object && policy == base::scoped_policy::RETAIN) - object = Traits::Retain(object); - if (object_) - Traits::Release(object_); - object_ = object; - } - - bool operator==(T that) const { return object_ == that; } - - bool operator!=(T that) const { return object_ != that; } - - operator T() const { return object_; } - - T get() const { return object_; } - - void swap(ScopedTypeRef& that) { - T temp = that.object_; - that.object_ = object_; - object_ = temp; - } - - T release() WARN_UNUSED_RESULT { - T temp = object_; - object_ = Traits::InvalidValue(); - return temp; - } - - private: - T object_; -}; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_MAC_SCOPED_TYPEREF_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h deleted file mode 100644 index 5d96783daa..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/macros.h +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_MACROS_H_ -#define MINI_CHROMIUM_BASE_MACROS_H_ - -#include -#include - -#include "base/compiler_specific.h" - -#if __cplusplus >= 201103L - -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&) = delete; \ - void operator=(const TypeName&) = delete - -#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName() = delete; \ - DISALLOW_COPY_AND_ASSIGN(TypeName) - -#else - -#define DISALLOW_COPY_AND_ASSIGN(TypeName) \ - TypeName(const TypeName&); \ - void operator=(const TypeName&) - -#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ - DISALLOW_COPY_AND_ASSIGN(TypeName) - -#endif - -template -char (&ArraySizeHelper(T (&array)[N]))[N]; - -template -char (&ArraySizeHelper(const T (&array)[N]))[N]; - -#define arraysize(array) (sizeof(ArraySizeHelper(array))) - -template -inline Dest bit_cast(const Source& source) { - static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal"); - - Dest dest; - memcpy(&dest, &source, sizeof(dest)); - return dest; -} - -template -inline void ignore_result(const T&) { -} - -#endif // MINI_CHROMIUM_BASE_MACROS_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h deleted file mode 100644 index be59d91b4f..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions.h +++ /dev/null @@ -1,287 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_ -#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_ - -#include - -#include -#include -#include - -#include "base/logging.h" -#include "base/numerics/safe_conversions_impl.h" - -namespace base { - -// The following are helper constexpr template functions and classes for safely -// performing a range of conversions, assignments, and tests: -// -// checked_cast<> - Analogous to static_cast<> for numeric types, except -// that it CHECKs that the specified numeric conversion will not overflow -// or underflow. NaN source will always trigger a CHECK. -// The default CHECK triggers a crash, but the handler can be overriden. -// saturated_cast<> - Analogous to static_cast<> for numeric types, except -// that it returns a saturated result when the specified numeric conversion -// would otherwise overflow or underflow. An NaN source returns 0 by -// default, but can be overridden to return a different result. -// strict_cast<> - Analogous to static_cast<> for numeric types, except that -// it will cause a compile failure if the destination type is not large -// enough to contain any value in the source type. It performs no runtime -// checking and thus introduces no runtime overhead. -// IsValueInRangeForNumericType<>() - A convenience function that returns true -// if the type supplied to the template parameter can represent the value -// passed as an argument to the function. -// IsValueNegative<>() - A convenience function that will accept any arithmetic -// type as an argument and will return whether the value is less than zero. -// Unsigned types always return false. -// StrictNumeric<> - A wrapper type that performs assignments and copies via -// the strict_cast<> template, and can perform valid arithmetic comparisons -// across any range of arithmetic types. StrictNumeric is the return type -// for values extracted from a CheckedNumeric class instance. The raw -// arithmetic value is extracted via static_cast to the underlying type. -// MakeStrictNum() - Creates a new StrictNumeric from the underlying type of -// the supplied arithmetic or StrictNumeric type. - -// Convenience function that returns true if the supplied value is in range -// for the destination type. -template -constexpr bool IsValueInRangeForNumericType(Src value) { - return internal::DstRangeRelationToSrcRange(value) == - internal::RANGE_VALID; -} - -// Convenience function for determining if a numeric value is negative without -// throwing compiler warnings on: unsigned(value) < 0. -template ::value>::type* = nullptr> -constexpr bool IsValueNegative(T value) { - static_assert(std::is_arithmetic::value, "Argument must be numeric."); - return value < 0; -} - -template ::value>::type* = nullptr> -constexpr bool IsValueNegative(T) { - static_assert(std::is_arithmetic::value, "Argument must be numeric."); - return false; -} - -// Forces a crash. Used for numeric boundary errors. -struct CheckOnFailure { - template - static T HandleFailure() { - CHECK(false); - return T(); - } -}; - -// checked_cast<> is analogous to static_cast<> for numeric types, -// except that it CHECKs that the specified numeric conversion will not -// overflow or underflow. NaN source will always trigger a CHECK. -template -constexpr Dst checked_cast(Src value) { - // This throws a compile-time error on evaluating the constexpr if it can be - // determined at compile-time as failing, otherwise it will CHECK at runtime. - using SrcType = typename internal::UnderlyingType::type; - return IsValueInRangeForNumericType(value) - ? static_cast(static_cast(value)) - : CheckHandler::template HandleFailure(); -} - -// HandleNaN will return 0 in this case. -struct SaturatedCastNaNBehaviorReturnZero { - template - static constexpr T HandleFailure() { - return T(); - } -}; - -namespace internal { -// These wrappers are used for C++11 constexpr support by avoiding both the -// declaration of local variables and invalid evaluation resulting from the -// lack of "constexpr if" support in the saturated_cast template function. -// TODO(jschuh): Convert to single function with a switch once we support C++14. -template < - typename Dst, - class NaNHandler, - typename Src, - typename std::enable_if::value>::type* = nullptr> -constexpr Dst saturated_cast_impl(const Src value, - const RangeConstraint constraint) { - return constraint == RANGE_VALID - ? static_cast(value) - : (constraint == RANGE_UNDERFLOW - ? std::numeric_limits::lowest() - : (constraint == RANGE_OVERFLOW - ? std::numeric_limits::max() - : NaNHandler::template HandleFailure())); -} - -template ::value>::type* = - nullptr> -constexpr Dst saturated_cast_impl(const Src value, - const RangeConstraint constraint) { - return constraint == RANGE_VALID - ? static_cast(value) - : (constraint == RANGE_UNDERFLOW - ? -std::numeric_limits::infinity() - : (constraint == RANGE_OVERFLOW - ? std::numeric_limits::infinity() - : std::numeric_limits::quiet_NaN())); -} - -// saturated_cast<> is analogous to static_cast<> for numeric types, except -// that the specified numeric conversion will saturate rather than overflow or -// underflow. NaN assignment to an integral will defer the behavior to a -// specified class. By default, it will return 0. -template -constexpr Dst saturated_cast(Src value) { - using SrcType = typename UnderlyingType::type; - return internal::saturated_cast_impl( - value, internal::DstRangeRelationToSrcRange(value)); -} - -// strict_cast<> is analogous to static_cast<> for numeric types, except that -// it will cause a compile failure if the destination type is not large enough -// to contain any value in the source type. It performs no runtime checking. -template -constexpr Dst strict_cast(Src value) { - using SrcType = typename UnderlyingType::type; - static_assert(UnderlyingType::is_numeric, "Argument must be numeric."); - static_assert(std::is_arithmetic::value, "Result must be numeric."); - - // If you got here from a compiler error, it's because you tried to assign - // from a source type to a destination type that has insufficient range. - // The solution may be to change the destination type you're assigning to, - // and use one large enough to represent the source. - // Alternatively, you may be better served with the checked_cast<> or - // saturated_cast<> template functions for your particular use case. - static_assert(StaticDstRangeRelationToSrcRange::value == - NUMERIC_RANGE_CONTAINED, - "The source type is out of range for the destination type. " - "Please see strict_cast<> comments for more information."); - - return static_cast(static_cast(value)); -} - -// Some wrappers to statically check that a type is in range. -template -struct IsNumericRangeContained { - static const bool value = false; -}; - -template -struct IsNumericRangeContained< - Dst, - Src, - typename std::enable_if::value && - ArithmeticOrUnderlyingEnum::value>::type> { - static const bool value = StaticDstRangeRelationToSrcRange::value == - NUMERIC_RANGE_CONTAINED; -}; - -// StrictNumeric implements compile time range checking between numeric types by -// wrapping assignment operations in a strict_cast. This class is intended to be -// used for function arguments and return types, to ensure the destination type -// can always contain the source type. This is essentially the same as enforcing -// -Wconversion in gcc and C4302 warnings on MSVC, but it can be applied -// incrementally at API boundaries, making it easier to convert code so that it -// compiles cleanly with truncation warnings enabled. -// This template should introduce no runtime overhead, but it also provides no -// runtime checking of any of the associated mathematical operations. Use -// CheckedNumeric for runtime range checks of the actual value being assigned. -template -class StrictNumeric { - public: - using type = T; - - constexpr StrictNumeric() : value_(0) {} - - // Copy constructor. - template - constexpr StrictNumeric(const StrictNumeric& rhs) - : value_(strict_cast(rhs.value_)) {} - - // This is not an explicit constructor because we implicitly upgrade regular - // numerics to StrictNumerics to make them easier to use. - template - constexpr StrictNumeric(Src value) // NOLINT(runtime/explicit) - : value_(strict_cast(value)) {} - - // If you got here from a compiler error, it's because you tried to assign - // from a source type to a destination type that has insufficient range. - // The solution may be to change the destination type you're assigning to, - // and use one large enough to represent the source. - // If you're assigning from a CheckedNumeric<> class, you may be able to use - // the AssignIfValid() member function, specify a narrower destination type to - // the member value functions (e.g. val.template ValueOrDie()), use one - // of the value helper functions (e.g. ValueOrDieForType(val)). - // If you've encountered an _ambiguous overload_ you can use a static_cast<> - // to explicitly cast the result to the destination type. - // If none of that works, you may be better served with the checked_cast<> or - // saturated_cast<> template functions for your particular use case. - template ::value>::type* = nullptr> - constexpr operator Dst() const { - return static_cast::type>(value_); - } - - private: - const T value_; -}; - -// Convience wrapper returns a StrictNumeric from the provided arithmetic type. -template -constexpr StrictNumeric::type> MakeStrictNum( - const T value) { - return value; -} - -// Overload the ostream output operator to make logging work nicely. -template -std::ostream& operator<<(std::ostream& os, const StrictNumeric& value) { - os << static_cast(value); - return os; -} - -#define STRICT_COMPARISON_OP(NAME, OP) \ - template ::value>::type* = nullptr> \ - constexpr bool operator OP(const L lhs, const R rhs) { \ - return SafeCompare::type, \ - typename UnderlyingType::type>(lhs, rhs); \ - } - -STRICT_COMPARISON_OP(IsLess, <); -STRICT_COMPARISON_OP(IsLessOrEqual, <=); -STRICT_COMPARISON_OP(IsGreater, >); -STRICT_COMPARISON_OP(IsGreaterOrEqual, >=); -STRICT_COMPARISON_OP(IsEqual, ==); -STRICT_COMPARISON_OP(IsNotEqual, !=); - -#undef STRICT_COMPARISON_OP -}; - -using internal::strict_cast; -using internal::saturated_cast; -using internal::StrictNumeric; -using internal::MakeStrictNum; - -// Explicitly make a shorter size_t alias for convenience. -using SizeT = StrictNumeric; - -} // namespace base - -#endif // MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_H_ diff --git a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h b/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h deleted file mode 100644 index 230a655e74..0000000000 --- a/Tools/Crashpad/include/third_party/mini_chromium/mini_chromium/base/numerics/safe_conversions_impl.h +++ /dev/null @@ -1,616 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ -#define MINI_CHROMIUM_BASE_NUMERICS_SAFE_CONVERSIONS_IMPL_H_ - -#include - -#include -#include - -namespace base { -namespace internal { - -// The std library doesn't provide a binary max_exponent for integers, however -// we can compute an analog using std::numeric_limits<>::digits. -template -struct MaxExponent { - static const int value = std::is_floating_point::value - ? std::numeric_limits::max_exponent - : std::numeric_limits::digits + 1; -}; - -// The number of bits (including the sign) in an integer. Eliminates sizeof -// hacks. -template -struct IntegerBitsPlusSign { - static const int value = std::numeric_limits::digits + - std::is_signed::value; -}; - -enum IntegerRepresentation { - INTEGER_REPRESENTATION_UNSIGNED, - INTEGER_REPRESENTATION_SIGNED -}; - -// A range for a given nunmeric Src type is contained for a given numeric Dst -// type if both numeric_limits::max() <= numeric_limits::max() and -// numeric_limits::lowest() >= numeric_limits::lowest() are true. -// We implement this as template specializations rather than simple static -// comparisons to ensure type correctness in our comparisons. -enum NumericRangeRepresentation { - NUMERIC_RANGE_NOT_CONTAINED, - NUMERIC_RANGE_CONTAINED -}; - -// Helper templates to statically determine if our destination type can contain -// maximum and minimum values represented by the source type. - -template ::value - ? INTEGER_REPRESENTATION_SIGNED - : INTEGER_REPRESENTATION_UNSIGNED, - IntegerRepresentation SrcSign = std::is_signed::value - ? INTEGER_REPRESENTATION_SIGNED - : INTEGER_REPRESENTATION_UNSIGNED> -struct StaticDstRangeRelationToSrcRange; - -// Same sign: Dst is guaranteed to contain Src only if its range is equal or -// larger. -template -struct StaticDstRangeRelationToSrcRange { - static const NumericRangeRepresentation value = - MaxExponent::value >= MaxExponent::value - ? NUMERIC_RANGE_CONTAINED - : NUMERIC_RANGE_NOT_CONTAINED; -}; - -// Unsigned to signed: Dst is guaranteed to contain source only if its range is -// larger. -template -struct StaticDstRangeRelationToSrcRange { - static const NumericRangeRepresentation value = - MaxExponent::value > MaxExponent::value - ? NUMERIC_RANGE_CONTAINED - : NUMERIC_RANGE_NOT_CONTAINED; -}; - -// Signed to unsigned: Dst cannot be statically determined to contain Src. -template -struct StaticDstRangeRelationToSrcRange { - static const NumericRangeRepresentation value = NUMERIC_RANGE_NOT_CONTAINED; -}; - -enum RangeConstraint { - RANGE_VALID = 0x0, // Value can be represented by the destination type. - RANGE_UNDERFLOW = 0x1, // Value would overflow. - RANGE_OVERFLOW = 0x2, // Value would underflow. - RANGE_INVALID = RANGE_UNDERFLOW | RANGE_OVERFLOW // Invalid (i.e. NaN). -}; - -// Helper function for coercing an int back to a RangeContraint. -constexpr RangeConstraint GetRangeConstraint(int integer_range_constraint) { - // TODO(jschuh): Once we get full C++14 support we want this - // assert(integer_range_constraint >= RANGE_VALID && - // integer_range_constraint <= RANGE_INVALID) - return static_cast(integer_range_constraint); -} - -// This function creates a RangeConstraint from an upper and lower bound -// check by taking advantage of the fact that only NaN can be out of range in -// both directions at once. -constexpr inline RangeConstraint GetRangeConstraint(bool is_in_upper_bound, - bool is_in_lower_bound) { - return GetRangeConstraint((is_in_upper_bound ? 0 : RANGE_OVERFLOW) | - (is_in_lower_bound ? 0 : RANGE_UNDERFLOW)); -} - -// The following helper template addresses a corner case in range checks for -// conversion from a floating-point type to an integral type of smaller range -// but larger precision (e.g. float -> unsigned). The problem is as follows: -// 1. Integral maximum is always one less than a power of two, so it must be -// truncated to fit the mantissa of the floating point. The direction of -// rounding is implementation defined, but by default it's always IEEE -// floats, which round to nearest and thus result in a value of larger -// magnitude than the integral value. -// Example: float f = UINT_MAX; // f is 4294967296f but UINT_MAX -// // is 4294967295u. -// 2. If the floating point value is equal to the promoted integral maximum -// value, a range check will erroneously pass. -// Example: (4294967296f <= 4294967295u) // This is true due to a precision -// // loss in rounding up to float. -// 3. When the floating point value is then converted to an integral, the -// resulting value is out of range for the target integral type and -// thus is implementation defined. -// Example: unsigned u = (float)INT_MAX; // u will typically overflow to 0. -// To fix this bug we manually truncate the maximum value when the destination -// type is an integral of larger precision than the source floating-point type, -// such that the resulting maximum is represented exactly as a floating point. -template -struct NarrowingRange { - using SrcLimits = typename std::numeric_limits; - using DstLimits = typename std::numeric_limits; - // The following logic avoids warnings where the max function is - // instantiated with invalid values for a bit shift (even though - // such a function can never be called). - static const int shift = (MaxExponent::value > MaxExponent::value && - SrcLimits::digits < DstLimits::digits && - SrcLimits::is_iec559 && - DstLimits::is_integer) - ? (DstLimits::digits - SrcLimits::digits) - : 0; - - static constexpr Dst max() { - // We use UINTMAX_C below to avoid compiler warnings about shifting floating - // points. Since it's a compile time calculation, it shouldn't have any - // performance impact. - return DstLimits::max() - static_cast((UINTMAX_C(1) << shift) - 1); - } - - static constexpr Dst lowest() { return DstLimits::lowest(); } -}; - -template ::value - ? INTEGER_REPRESENTATION_SIGNED - : INTEGER_REPRESENTATION_UNSIGNED, - IntegerRepresentation SrcSign = std::is_signed::value - ? INTEGER_REPRESENTATION_SIGNED - : INTEGER_REPRESENTATION_UNSIGNED, - NumericRangeRepresentation DstRange = - StaticDstRangeRelationToSrcRange::value> -struct DstRangeRelationToSrcRangeImpl; - -// The following templates are for ranges that must be verified at runtime. We -// split it into checks based on signedness to avoid confusing casts and -// compiler warnings on signed an unsigned comparisons. - -// Dst range is statically determined to contain Src: Nothing to check. -template -struct DstRangeRelationToSrcRangeImpl { - static constexpr RangeConstraint Check(Src value) { return RANGE_VALID; } -}; - -// Signed to signed narrowing: Both the upper and lower boundaries may be -// exceeded. -template -struct DstRangeRelationToSrcRangeImpl { - static constexpr RangeConstraint Check(Src value) { - return GetRangeConstraint((value <= NarrowingRange::max()), - (value >= NarrowingRange::lowest())); - } -}; - -// Unsigned to unsigned narrowing: Only the upper boundary can be exceeded. -template -struct DstRangeRelationToSrcRangeImpl { - static constexpr RangeConstraint Check(Src value) { - return GetRangeConstraint(value <= NarrowingRange::max(), true); - } -}; - -// Unsigned to signed: The upper boundary may be exceeded. -template -struct DstRangeRelationToSrcRangeImpl { - static constexpr RangeConstraint Check(Src value) { - return IntegerBitsPlusSign::value > IntegerBitsPlusSign::value - ? RANGE_VALID - : GetRangeConstraint( - value <= static_cast(NarrowingRange::max()), - true); - } -}; - -// Signed to unsigned: The upper boundary may be exceeded for a narrower Dst, -// and any negative value exceeds the lower boundary. -template -struct DstRangeRelationToSrcRangeImpl { - static constexpr RangeConstraint Check(Src value) { - return (MaxExponent::value >= MaxExponent::value) - ? GetRangeConstraint(true, value >= static_cast(0)) - : GetRangeConstraint( - value <= static_cast(NarrowingRange::max()), - value >= static_cast(0)); - } -}; - -template -constexpr RangeConstraint DstRangeRelationToSrcRange(Src value) { - static_assert(std::is_arithmetic::value, "Argument must be numeric."); - static_assert(std::is_arithmetic::value, "Result must be numeric."); - return DstRangeRelationToSrcRangeImpl::Check(value); -} - -// Integer promotion templates used by the portable checked integer arithmetic. -template -struct IntegerForDigitsAndSign; - -#define INTEGER_FOR_DIGITS_AND_SIGN(I) \ - template <> \ - struct IntegerForDigitsAndSign::value, \ - std::is_signed::value> { \ - using type = I; \ - } - -INTEGER_FOR_DIGITS_AND_SIGN(int8_t); -INTEGER_FOR_DIGITS_AND_SIGN(uint8_t); -INTEGER_FOR_DIGITS_AND_SIGN(int16_t); -INTEGER_FOR_DIGITS_AND_SIGN(uint16_t); -INTEGER_FOR_DIGITS_AND_SIGN(int32_t); -INTEGER_FOR_DIGITS_AND_SIGN(uint32_t); -INTEGER_FOR_DIGITS_AND_SIGN(int64_t); -INTEGER_FOR_DIGITS_AND_SIGN(uint64_t); -#undef INTEGER_FOR_DIGITS_AND_SIGN - -// WARNING: We have no IntegerForSizeAndSign<16, *>. If we ever add one to -// support 128-bit math, then the ArithmeticPromotion template below will need -// to be updated (or more likely replaced with a decltype expression). -static_assert(IntegerBitsPlusSign::value == 64, - "Max integer size not supported for this toolchain."); - -template ::value> -struct TwiceWiderInteger { - using type = - typename IntegerForDigitsAndSign::value * 2, - IsSigned>::type; -}; - -template -struct PositionOfSignBit { - static const size_t value = IntegerBitsPlusSign::value - 1; -}; - -enum ArithmeticPromotionCategory { - LEFT_PROMOTION, // Use the type of the left-hand argument. - RIGHT_PROMOTION // Use the type of the right-hand argument. -}; - -// Determines the type that can represent the largest positive value. -template ::value > MaxExponent::value) - ? LEFT_PROMOTION - : RIGHT_PROMOTION> -struct MaxExponentPromotion; - -template -struct MaxExponentPromotion { - using type = Lhs; -}; - -template -struct MaxExponentPromotion { - using type = Rhs; -}; - -// Determines the type that can represent the lowest arithmetic value. -template ::value - ? (std::is_signed::value - ? (MaxExponent::value > MaxExponent::value - ? LEFT_PROMOTION - : RIGHT_PROMOTION) - : LEFT_PROMOTION) - : (std::is_signed::value - ? RIGHT_PROMOTION - : (MaxExponent::value < MaxExponent::value - ? LEFT_PROMOTION - : RIGHT_PROMOTION))> -struct LowestValuePromotion; - -template -struct LowestValuePromotion { - using type = Lhs; -}; - -template -struct LowestValuePromotion { - using type = Rhs; -}; - -// Determines the type that is best able to represent an arithmetic result. -template < - typename Lhs, - typename Rhs = Lhs, - bool is_intmax_type = - std::is_integral::type>::value&& - IntegerBitsPlusSign::type>:: - value == IntegerBitsPlusSign::value, - bool is_max_exponent = - StaticDstRangeRelationToSrcRange< - typename MaxExponentPromotion::type, - Lhs>::value == - NUMERIC_RANGE_CONTAINED&& StaticDstRangeRelationToSrcRange< - typename MaxExponentPromotion::type, - Rhs>::value == NUMERIC_RANGE_CONTAINED> -struct BigEnoughPromotion; - -// The side with the max exponent is big enough. -template -struct BigEnoughPromotion { - using type = typename MaxExponentPromotion::type; - static const bool is_contained = true; -}; - -// We can use a twice wider type to fit. -template -struct BigEnoughPromotion { - using type = - typename TwiceWiderInteger::type, - std::is_signed::value || - std::is_signed::value>::type; - static const bool is_contained = true; -}; - -// No type is large enough. -template -struct BigEnoughPromotion { - using type = typename MaxExponentPromotion::type; - static const bool is_contained = false; -}; - -// We can statically check if operations on the provided types can wrap, so we -// can skip the checked operations if they're not needed. So, for an integer we -// care if the destination type preserves the sign and is twice the width of -// the source. -template -struct IsIntegerArithmeticSafe { - static const bool value = - !std::is_floating_point::value && - StaticDstRangeRelationToSrcRange::value == - NUMERIC_RANGE_CONTAINED && - IntegerBitsPlusSign::value >= (2 * IntegerBitsPlusSign::value) && - StaticDstRangeRelationToSrcRange::value != - NUMERIC_RANGE_CONTAINED && - IntegerBitsPlusSign::value >= (2 * IntegerBitsPlusSign::value); -}; - -// This hacks around libstdc++ 4.6 missing stuff in type_traits. -#if defined(__GLIBCXX__) -#define PRIV_GLIBCXX_4_7_0 20120322 -#define PRIV_GLIBCXX_4_5_4 20120702 -#define PRIV_GLIBCXX_4_6_4 20121127 -#if (__GLIBCXX__ < PRIV_GLIBCXX_4_7_0 || __GLIBCXX__ == PRIV_GLIBCXX_4_5_4 || \ - __GLIBCXX__ == PRIV_GLIBCXX_4_6_4) -#define PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX -#undef PRIV_GLIBCXX_4_7_0 -#undef PRIV_GLIBCXX_4_5_4 -#undef PRIV_GLIBCXX_4_6_4 -#endif -#endif - -// Extracts the underlying type from an enum. -template ::value> -struct ArithmeticOrUnderlyingEnum; - -template -struct ArithmeticOrUnderlyingEnum { -#if defined(PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX) - using type = __underlying_type(T); -#else - using type = typename std::underlying_type::type; -#endif - static const bool value = std::is_arithmetic::value; -}; - -#if defined(PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX) -#undef PRIV_USE_FALLBACKS_FOR_OLD_GLIBCXX -#endif - -template -struct ArithmeticOrUnderlyingEnum { - using type = T; - static const bool value = std::is_arithmetic::value; -}; - -// The following are helper templates used in the CheckedNumeric class. -template -class CheckedNumeric; - -template -class StrictNumeric; - -// Used to treat CheckedNumeric and arithmetic underlying types the same. -template -struct UnderlyingType { - using type = typename ArithmeticOrUnderlyingEnum::type; - static const bool is_numeric = std::is_arithmetic::value; - static const bool is_checked = false; - static const bool is_strict = false; -}; - -template -struct UnderlyingType> { - using type = T; - static const bool is_numeric = true; - static const bool is_checked = true; - static const bool is_strict = false; -}; - -template -struct UnderlyingType> { - using type = T; - static const bool is_numeric = true; - static const bool is_checked = false; - static const bool is_strict = true; -}; - -template -struct IsCheckedOp { - static const bool value = - UnderlyingType::is_numeric && UnderlyingType::is_numeric && - (UnderlyingType::is_checked || UnderlyingType::is_checked); -}; - -template -struct IsStrictOp { - static const bool value = - UnderlyingType::is_numeric && UnderlyingType::is_numeric && - (UnderlyingType::is_strict || UnderlyingType::is_strict); -}; - -template -constexpr bool IsLessImpl(const L lhs, - const R rhs, - const RangeConstraint l_range, - const RangeConstraint r_range) { - return l_range == RANGE_UNDERFLOW || r_range == RANGE_OVERFLOW || - (l_range == r_range && - static_cast(lhs) < - static_cast(rhs)); -} - -template -struct IsLess { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return IsLessImpl(lhs, rhs, DstRangeRelationToSrcRange(lhs), - DstRangeRelationToSrcRange(rhs)); - } -}; - -template -constexpr bool IsLessOrEqualImpl(const L lhs, - const R rhs, - const RangeConstraint l_range, - const RangeConstraint r_range) { - return l_range == RANGE_UNDERFLOW || r_range == RANGE_OVERFLOW || - (l_range == r_range && - static_cast(lhs) <= - static_cast(rhs)); -} - -template -struct IsLessOrEqual { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return IsLessOrEqualImpl(lhs, rhs, DstRangeRelationToSrcRange(lhs), - DstRangeRelationToSrcRange(rhs)); - } -}; - -template -constexpr bool IsGreaterImpl(const L lhs, - const R rhs, - const RangeConstraint l_range, - const RangeConstraint r_range) { - return l_range == RANGE_OVERFLOW || r_range == RANGE_UNDERFLOW || - (l_range == r_range && - static_cast(lhs) > - static_cast(rhs)); -} - -template -struct IsGreater { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return IsGreaterImpl(lhs, rhs, DstRangeRelationToSrcRange(lhs), - DstRangeRelationToSrcRange(rhs)); - } -}; - -template -constexpr bool IsGreaterOrEqualImpl(const L lhs, - const R rhs, - const RangeConstraint l_range, - const RangeConstraint r_range) { - return l_range == RANGE_OVERFLOW || r_range == RANGE_UNDERFLOW || - (l_range == r_range && - static_cast(lhs) >= - static_cast(rhs)); -} - -template -struct IsGreaterOrEqual { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return IsGreaterOrEqualImpl(lhs, rhs, DstRangeRelationToSrcRange(lhs), - DstRangeRelationToSrcRange(rhs)); - } -}; - -template -struct IsEqual { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return DstRangeRelationToSrcRange(lhs) == - DstRangeRelationToSrcRange(rhs) && - static_cast(lhs) == - static_cast(rhs); - } -}; - -template -struct IsNotEqual { - static_assert(std::is_arithmetic::value && std::is_arithmetic::value, - "Types must be numeric."); - static constexpr bool Test(const L lhs, const R rhs) { - return DstRangeRelationToSrcRange(lhs) != - DstRangeRelationToSrcRange(rhs) || - static_cast(lhs) != - static_cast(rhs); - } -}; - -// These perform the actual math operations on the CheckedNumerics. -// Binary arithmetic operations. -template