Skip to content

Commit ca34cf9

Browse files
committed
Fix build
1 parent c079cac commit ca34cf9

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

core/adapters/dbgengttdadapter.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -901,13 +901,7 @@ bool DbgEngTTDAdapter::ParseTTDMemoryObjects(const std::string& expression, TTDM
901901
std::vector<TTDCallEvent> DbgEngTTDAdapter::GetCallsForSymbols(const std::vector<std::string>& symbols, uint64_t startReturnAddress, uint64_t endReturnAddress)
902902
{
903903
std::vector<TTDCallEvent> events;
904-
905-
if (!IsConnected())
906-
{
907-
LogError("Not connected to target");
908-
return events;
909-
}
910-
904+
911905
if (symbols.empty())
912906
{
913907
LogError("No symbols provided for TTD calls query");
@@ -1030,7 +1024,7 @@ bool DbgEngTTDAdapter::ParseTTDCallObjects(const std::string& expression, std::v
10301024
ComPtr<IModelObject> callObject;
10311025
ComPtr<IKeyStore> callMetadataKeyStore;
10321026

1033-
while (SUCCEEDED(iterator->GetNext(&callObject, nullptr, &callMetadataKeyStore)))
1027+
while (SUCCEEDED(iterator->GetNext(&callObject, 0, nullptr, &callMetadataKeyStore)))
10341028
{
10351029
if (!callObject)
10361030
break;
@@ -1145,7 +1139,7 @@ bool DbgEngTTDAdapter::ParseTTDCallObjects(const std::string& expression, std::v
11451139
ComPtr<IModelObject> paramObj;
11461140
ComPtr<IKeyStore> paramMetadataKeyStore;
11471141

1148-
while (SUCCEEDED(paramsIterator->GetNext(&paramObj, nullptr, &paramMetadataKeyStore)))
1142+
while (SUCCEEDED(paramsIterator->GetNext(&paramObj, 0, nullptr, &paramMetadataKeyStore)))
11491143
{
11501144
if (!paramObj)
11511145
break;

ui/ttdcallswidget.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,11 @@ void TTDCallsQueryWidget::onCellDoubleClicked(int row, int column)
335335
if (ok && address != 0)
336336
{
337337
// Navigate to address in Binary Ninja
338-
m_data->Navigate(m_data->GetDefaultPlatform(), address);
338+
ViewFrame* frame = ViewFrame::viewFrameForWidget(this);
339+
if (frame)
340+
{
341+
frame->navigate(m_data, address);
342+
}
339343
}
340344
}
341345
}
@@ -595,7 +599,7 @@ void TTDCallsWidget::setParametersAndQueryInNewTab(const std::vector<std::string
595599

596600
// TTDCallsSidebarWidget implementation
597601

598-
TTDCallsSidebarWidget::TTDCallsSidebarWidget(BinaryViewRef data) : m_data(data)
602+
TTDCallsSidebarWidget::TTDCallsSidebarWidget(BinaryViewRef data) : SidebarWidget("TTD Calls"), m_data(data)
599603
{
600604
m_controller = DebuggerController::GetController(data);
601605

ui/ui.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
10961096

10971097
// TTD Calls menu actions
10981098
UIAction::registerAction("TTD Calls\\All Calls");
1099-
UIAction::setActionHandler("TTD Calls\\All Calls", UIAction([=](const UIActionContext& ctxt) {
1099+
context->globalActions()->bindAction("TTD Calls\\All Calls", UIAction([=](const UIActionContext& ctxt) {
11001100
auto controller = DebuggerController::GetController(ctxt.binaryView);
11011101
if (!controller || !controller->IsConnected())
11021102
return;
@@ -1109,7 +1109,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
11091109
debuggerMenu->addAction("TTD Calls\\All Calls", "TTD");
11101110

11111111
UIAction::registerAction("TTD Calls\\Kernel32 Calls");
1112-
UIAction::setActionHandler("TTD Calls\\Kernel32 Calls", UIAction([=](const UIActionContext& ctxt) {
1112+
context->globalActions()->bindAction("TTD Calls\\Kernel32 Calls", UIAction([=](const UIActionContext& ctxt) {
11131113
auto controller = DebuggerController::GetController(ctxt.binaryView);
11141114
if (!controller || !controller->IsConnected())
11151115
return;
@@ -1122,7 +1122,7 @@ void GlobalDebuggerUI::SetupMenu(UIContext* context)
11221122
debuggerMenu->addAction("TTD Calls\\Kernel32 Calls", "TTD");
11231123

11241124
UIAction::registerAction("TTD Calls\\Ntdll Calls");
1125-
UIAction::setActionHandler("TTD Calls\\Ntdll Calls", UIAction([=](const UIActionContext& ctxt) {
1125+
context->globalActions()->bindAction("TTD Calls\\Ntdll Calls", UIAction([=](const UIActionContext& ctxt) {
11261126
auto controller = DebuggerController::GetController(ctxt.binaryView);
11271127
if (!controller || !controller->IsConnected())
11281128
return;

0 commit comments

Comments
 (0)