Skip to content

fix regression in nested visualizations with VS2019+ #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Scottj1s merged 3 commits into from
Mar 24, 2022
Merged

fix regression in nested visualizations with VS2019+ #1126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63f43f1
fix regression in nested visualizations with VS2019+
Scottj1s Mar 23, 2022
018cd85
bug in calculating child count
Scottj1s Mar 23, 2022
5750b81
Merge branch 'master' into nested_viz
Scottj1s Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions natvis/object_visualizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,11 +631,10 @@ HRESULT object_visualizer::CreateEvaluationResult(_Deref_out_ DkmEvaluationResul
}

HRESULT object_visualizer::GetChildren(
_In_ UINT32 /*InitialRequestSize*/,
_In_ UINT32 InitialRequestSize,
_In_ DkmInspectionContext* pInspectionContext,
_Out_ DkmArray<DkmChildVisualizedExpression*>* pInitialChildren,
_Deref_out_ DkmEvaluationResultEnumContext** ppEnumContext
)
_Deref_out_ DkmEvaluationResultEnumContext** ppEnumContext)
{
// Ignore metadata errors to ensure that Raw Data is always available
if (m_propertyData.empty())
Expand Down Expand Up @@ -667,32 +666,34 @@ HRESULT object_visualizer::GetChildren(
this,
pEnumContext.put()));

DkmAllocArray(0, pInitialChildren);
IF_FAIL_RET(GetItems(m_pVisualizedExpression.get(), pEnumContext.get(), 0, InitialRequestSize, pInitialChildren));

*ppEnumContext = pEnumContext.detach();

return S_OK;
}

HRESULT object_visualizer::GetItems(
_In_ DkmVisualizedExpression* /*pVisualizedExpression*/,
_In_ DkmVisualizedExpression* pVisualizedExpression,
_In_ DkmEvaluationResultEnumContext* /*pEnumContext*/,
_In_ UINT32 StartIndex,
_In_ UINT32 Count,
_Out_ DkmArray<DkmChildVisualizedExpression*>* pItems
)
_Out_ DkmArray<DkmChildVisualizedExpression*>* pItems)
{
std::list<com_ptr<DkmChildVisualizedExpression>> childItems;
CAutoDkmArray<DkmChildVisualizedExpression*> resultValues;
IF_FAIL_RET(DkmAllocArray(std::min(m_propertyData.size(), size_t(Count)), &resultValues));

auto pParent = m_pVisualizedExpression.get();
for( auto childIndex = StartIndex; childIndex < StartIndex + Count; ++childIndex)
auto pParent = pVisualizedExpression;
auto childCount = std::min(m_propertyData.size() - StartIndex, (size_t)Count);
for(auto i = 0; i < childCount; ++i)
{
auto& prop = m_propertyData[childIndex];
auto& prop = m_propertyData[i + (size_t)StartIndex];
com_ptr<DkmChildVisualizedExpression> pPropertyVisualized;
if(FAILED(CreateChildVisualizedExpression(prop, pParent, m_isAbiObject, pPropertyVisualized.put())))
if (FAILED(CreateChildVisualizedExpression(prop, pParent, m_isAbiObject, pPropertyVisualized.put())))
{
com_ptr<DkmString> pErrorMessage;
IF_FAIL_RET(DkmString::Create(L"<Property evaluation failed>", pErrorMessage.put()));

com_ptr<DkmString> pDisplayName;
IF_FAIL_RET(DkmString::Create(prop.displayName.c_str(), pDisplayName.put()));

Expand All @@ -701,9 +702,9 @@ HRESULT object_visualizer::GetItems(
pParent->InspectionContext(),
pParent->StackFrame(),
pDisplayName.get(),
nullptr,
nullptr,
pErrorMessage.get(),
DkmEvaluationResultFlags::ExceptionThrown,
DkmEvaluationResultFlags::ExceptionThrown,
DkmDataItem::Null(),
pVisualizedResult.put()
));
Expand All @@ -721,22 +722,9 @@ HRESULT object_visualizer::GetItems(
pPropertyVisualized.put()
));
}
childItems.push_back(pPropertyVisualized);
}

CAutoDkmArray<DkmChildVisualizedExpression*> resultValues;
IF_FAIL_RET(DkmAllocArray(childItems.size(), &resultValues));

UINT32 j = 0;
auto pos = childItems.begin();
while (pos != childItems.end())
{
com_ptr<DkmChildVisualizedExpression> pCurr = *pos;
resultValues.Members[j++] = pCurr.detach();
pos++;
resultValues.Members[i] = pPropertyVisualized.detach();
}

*pItems = resultValues.Detach();

return S_OK;
}