Implement a symbol reconstruction feature

ergrelet · Apr 13, 2024 · 7c2c52f · 7c2c52f
1 parent 425a277
commit 7c2c52f
Show file tree

Hide file tree

Showing 22 changed files with 1,095 additions and 256 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/resym/src/resym_app.rs b/resym/src/resym_app.rs
diff --git a/resym/src/ui_components/type_list.rs → resym/src/ui_components/index_list.rs b/resym/src/ui_components/type_list.rs → resym/src/ui_components/index_list.rs
@@ -1,45 +1,40 @@
 use eframe::egui::{self, ScrollArea, TextStyle};
-use resym_core::frontend::{TypeIndex, TypeList};
 
-pub struct TypeListComponent {
-    filtered_type_list: TypeList,
+pub struct IndexListComponent<I: Copy> {
+    index_list: Vec<(String, I)>,
     selected_row: usize,
-    list_ordering: TypeListOrdering,
+    list_ordering: IndexListOrdering,
 }
 
-pub enum TypeListOrdering {
+pub enum IndexListOrdering {
     /// Doesn't respect any particular order
     None,
     /// Orders types alphabetically
     Alphabetical,
 }
 
-impl TypeListComponent {
-    pub fn new(ordering: TypeListOrdering) -> Self {
+impl<I: Copy> IndexListComponent<I> {
+    pub fn new(ordering: IndexListOrdering) -> Self {
         Self {
-            filtered_type_list: vec![],
+            index_list: vec![],
             selected_row: usize::MAX,
             list_ordering: ordering,
         }
     }
 
-    pub fn update_type_list(&mut self, type_list: TypeList) {
-        self.filtered_type_list = type_list;
+    pub fn update_index_list(&mut self, index_list: Vec<(String, I)>) {
+        self.index_list = index_list;
         self.selected_row = usize::MAX;
 
         // Reorder list if needed
-        if let TypeListOrdering::Alphabetical = self.list_ordering {
-            self.filtered_type_list
+        if let IndexListOrdering::Alphabetical = self.list_ordering {
+            self.index_list
                 .sort_unstable_by(|lhs, rhs| lhs.0.cmp(&rhs.0));
         }
     }
 
-    pub fn update<CB: FnMut(&str, TypeIndex)>(
-        &mut self,
-        ui: &mut egui::Ui,
-        on_type_selected: &mut CB,
-    ) {
-        let num_rows = self.filtered_type_list.len();
+    pub fn update<CB: FnMut(&str, I)>(&mut self, ui: &mut egui::Ui, on_element_selected: &mut CB) {
+        let num_rows = self.index_list.len();
         const TEXT_STYLE: TextStyle = TextStyle::Body;
         let row_height = ui.text_style_height(&TEXT_STYLE);
         ui.with_layout(
@@ -55,14 +50,14 @@ impl TypeListComponent {
                     .auto_shrink([false, false])
                     .show_rows(ui, row_height, num_rows, |ui, row_range| {
                         for row_index in row_range {
-                            let (type_name, type_index) = &self.filtered_type_list[row_index];
+                            let (type_name, type_index) = &self.index_list[row_index];
 
                             if ui
                                 .selectable_label(self.selected_row == row_index, type_name)
                                 .clicked()
                             {
                                 self.selected_row = row_index;
-                                on_type_selected(type_name, *type_index);
+                                on_element_selected(type_name, *type_index);
                             }
                         }
                     });
@@ -71,8 +66,8 @@ impl TypeListComponent {
     }
 }
 
-impl Default for TypeListComponent {
+impl<I: Copy> Default for IndexListComponent<I> {
     fn default() -> Self {
-        Self::new(TypeListOrdering::None)
+        Self::new(IndexListOrdering::None)
     }
 }
diff --git a/resym/src/ui_components/mod.rs b/resym/src/ui_components/mod.rs
@@ -1,17 +1,17 @@
 mod code_view;
 mod console;
+mod index_list;
 mod module_tree;
 #[cfg(feature = "http")]
 mod open_url;
 mod settings;
 mod text_search;
-mod type_list;
 
 pub use code_view::*;
 pub use console::*;
+pub use index_list::*;
 pub use module_tree::*;
 #[cfg(feature = "http")]
 pub use open_url::*;
 pub use settings::*;
 pub use text_search::*;
-pub use type_list::*;
diff --git a/resym/src/ui_components/module_tree.rs b/resym/src/ui_components/module_tree.rs
@@ -2,7 +2,7 @@ use std::cell::RefCell;
 
 use eframe::egui::{self, ScrollArea};
 
-use resym_core::frontend::ModuleList;
+use resym_core::pdb_file::ModuleList;
 
 use crate::{
     module_tree::{ModuleInfo, ModulePath, ModuleTreeNode},

diff --git a/resym_core/Cargo.toml b/resym_core/Cargo.toml
@@ -26,6 +26,7 @@ regex = "1.10"
 similar = "2.4"
 ehttp = { version = "0.5", optional = true }
 url = { version = "2.5", optional = true }
+msvc-demangler = "0.10"
 
 # Web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]