Skip to content

Commit 3f0895e

Browse files
committed
Try to clean some analysis warnings.
1 parent 39cf543 commit 3f0895e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

natvis/cppwinrt_visualizer.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ cppwinrt_visualizer::~cppwinrt_visualizer()
273273

274274
HRESULT cppwinrt_visualizer::EvaluateVisualizedExpression(
275275
_In_ DkmVisualizedExpression* pVisualizedExpression,
276-
_Deref_out_ DkmEvaluationResult** ppResultObject
276+
_COM_Outptr_result_maybenull_ DkmEvaluationResult** ppResultObject
277277
)
278278
{
279279
try
@@ -313,6 +313,7 @@ HRESULT cppwinrt_visualizer::EvaluateVisualizedExpression(
313313
// unrecognized type
314314
NatvisDiagnostic(pVisualizedExpression,
315315
std::wstring(L"Unrecognized type: ") + (LPWSTR)bstrTypeName, NatvisDiagnosticLevel::Error);
316+
*ppResultObject = nullptr;
316317
return S_OK;
317318
}
318319

natvis/cppwinrt_visualizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ struct cppwinrt_visualizer : winrt::implements<cppwinrt_visualizer,
88

99
STDMETHOD(EvaluateVisualizedExpression)(
1010
_In_ Microsoft::VisualStudio::Debugger::Evaluation::DkmVisualizedExpression* pVisualizedExpression,
11-
_Deref_out_ Microsoft::VisualStudio::Debugger::Evaluation::DkmEvaluationResult** ppResultObject
11+
_COM_Outptr_result_maybenull_ Microsoft::VisualStudio::Debugger::Evaluation::DkmEvaluationResult** ppResultObject
1212
);
1313
STDMETHOD(UseDefaultEvaluationBehavior)(
1414
_In_ Microsoft::VisualStudio::Debugger::Evaluation::DkmVisualizedExpression* pVisualizedExpression,

0 commit comments

Comments
 (0)