diff --git a/src/raddbg/generated/raddbg.meta.c b/src/raddbg/generated/raddbg.meta.c index 5ae159db..b4f2ccd0 100644 --- a/src/raddbg/generated/raddbg.meta.c +++ b/src/raddbg/generated/raddbg.meta.c @@ -450,7 +450,7 @@ RD_CmdKindInfo rd_cmd_kind_info_table[218] = { str8_lit_comp("types"), str8_lit_comp("Opens a types view."), str8_lit_comp(""), str8_lit_comp("Types"), RD_IconKind_Binoculars, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, { str8_lit_comp("procedures"), str8_lit_comp("Opens a procedures view."), str8_lit_comp(""), str8_lit_comp("Procedures"), RD_IconKind_Binoculars, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, { str8_lit_comp("pending_file"), str8_lit_comp("Opens a view which asynchronously analyzes the file path parameter, then picks an appropriate viewer for it."), str8_lit_comp(""), str8_lit_comp("Pending File"), RD_IconKind_FileOutline, (RD_CmdKindFlag_ListInUI*0)|(RD_CmdKindFlag_ListInIPCDocs*0), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, -{ str8_lit_comp("disassembly"), str8_lit_comp("Opens the disassembly view."), str8_lit_comp("disasm"), str8_lit_comp("Disassembly"), RD_IconKind_Glasses, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, +{ str8_lit_comp("disasm"), str8_lit_comp("Opens the disassembly view."), str8_lit_comp("disasm"), str8_lit_comp("Disassembly"), RD_IconKind_Glasses, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, { str8_lit_comp("output"), str8_lit_comp("Opens an output view."), str8_lit_comp(""), str8_lit_comp("Output"), RD_IconKind_List, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, { str8_lit_comp("memory"), str8_lit_comp("Opens a memory view."), str8_lit_comp(""), str8_lit_comp("Memory"), RD_IconKind_Grid, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, { str8_lit_comp("exception_filters"), str8_lit_comp("Opens the exception filters view."), str8_lit_comp("exceptions,filters"), str8_lit_comp("Exception Filters"), RD_IconKind_Gear, (RD_CmdKindFlag_ListInUI*1)|(RD_CmdKindFlag_ListInIPCDocs*1), {(RD_QueryFlag_AllowFiles*0)|(RD_QueryFlag_AllowFolders*0)|(RD_QueryFlag_CodeInput*0)|(RD_QueryFlag_KeepOldInput*0)|(RD_QueryFlag_SelectOldInput*0)|(RD_QueryFlag_Required*0), RD_RegSlot_Null, str8_lit_comp(""), RD_EntityKind_Nil}}, diff --git a/src/raddbg/raddbg.mdesk b/src/raddbg/raddbg.mdesk index 17096734..163b7045 100644 --- a/src/raddbg/raddbg.mdesk +++ b/src/raddbg/raddbg.mdesk @@ -478,7 +478,7 @@ RD_CmdTable: // | | | | {Types 1 1 Null null Nil 0 0 0 0 0 0 Binoculars "types" "Types" "Opens a types view." "" } {Procedures 1 1 Null null Nil 0 0 0 0 0 0 Binoculars "procedures" "Procedures" "Opens a procedures view." "" } {PendingFile 0 0 Null null Nil 0 0 0 0 0 0 FileOutline "pending_file" "Pending File" "Opens a view which asynchronously analyzes the file path parameter, then picks an appropriate viewer for it." "" } - {Disassembly 1 1 Null null Nil 0 0 0 0 0 0 Glasses "disassembly" "Disassembly" "Opens the disassembly view." "disasm" } + {Disassembly 1 1 Null null Nil 0 0 0 0 0 0 Glasses "disasm" "Disassembly" "Opens the disassembly view." "disasm" } {Output 1 1 Null null Nil 0 0 0 0 0 0 List "output" "Output" "Opens an output view." "" } {Memory 1 1 Null null Nil 0 0 0 0 0 0 Grid "memory" "Memory" "Opens a memory view." "" } {ExceptionFilters 1 1 Null null Nil 0 0 0 0 0 0 Gear "exception_filters" "Exception Filters" "Opens the exception filters view." "exceptions,filters" } diff --git a/src/raddbg/raddbg_views.c b/src/raddbg/raddbg_views.c index 27df06cc..b36f9147 100644 --- a/src/raddbg/raddbg_views.c +++ b/src/raddbg/raddbg_views.c @@ -52,8 +52,7 @@ rd_code_view_build(Arena *arena, RD_CodeViewState *cv, RD_CodeViewBuildFlags fla for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -4665,8 +4664,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(target) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->params.window) || - !rd_handle_match(rd_regs()->panel, cmd->params.panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -5148,8 +5146,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(file_path_map) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -5765,8 +5762,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(modules) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -6219,8 +6215,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(pending_file) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -6357,8 +6352,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(text) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -6667,8 +6661,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(disasm) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; } @@ -6901,8 +6894,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(memory) for(RD_Cmd *cmd = 0; rd_next_cmd(&cmd);) { // rjf: mismatched window/panel => skip - if(!rd_handle_match(rd_regs()->window, cmd->regs->window) || - !rd_handle_match(rd_regs()->panel, cmd->regs->panel)) + if(!rd_handle_match(rd_regs()->view, cmd->regs->view)) { continue; }