Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[common]Add null checks to FindDesktopFolderView (#22908)

Browse Source
This commit is contained in:
Jaime Bernardo
2022-12-20 19:29:24 +00:00
committed by GitHub
parent 4f4810acc4
commit 46099058b5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/utils/elevation.h
View File

@@ -34,7 +34,7 @@ namespace
{ {
CComPtr<IShellWindows> spShellWindows; CComPtr<IShellWindows> spShellWindows;
auto result = spShellWindows.CoCreateInstance(CLSID_ShellWindows); auto result = spShellWindows.CoCreateInstance(CLSID_ShellWindows);
if (result != S_OK) if (result != S_OK || spShellWindows == nullptr)
{ {
Logger::warn(L"Failed to create instance. {}", GetErrorString(result)); Logger::warn(L"Failed to create instance. {}", GetErrorString(result));
return false; return false;
@@ -47,7 +47,7 @@ namespace
result = spShellWindows->FindWindowSW( result = spShellWindows->FindWindowSW(
&vtLoc, &vtEmpty, SWC_DESKTOP, &lhwnd, SWFO_NEEDDISPATCH, &spdisp); &vtLoc, &vtEmpty, SWC_DESKTOP, &lhwnd, SWFO_NEEDDISPATCH, &spdisp);
if (result != S_OK) if (result != S_OK || spdisp == nullptr)
{ {
Logger::warn(L"Failed to find the window. {}", GetErrorString(result)); Logger::warn(L"Failed to find the window. {}", GetErrorString(result));
return false; return false;
@@ -56,7 +56,7 @@ namespace
CComPtr<IShellBrowser> spBrowser; CComPtr<IShellBrowser> spBrowser;
result = CComQIPtr<IServiceProvider>(spdisp)->QueryService(SID_STopLevelBrowser, result = CComQIPtr<IServiceProvider>(spdisp)->QueryService(SID_STopLevelBrowser,
IID_PPV_ARGS(&spBrowser)); IID_PPV_ARGS(&spBrowser));
if (result != S_OK) if (result != S_OK || spBrowser == nullptr)
{ {
Logger::warn(L"Failed to query service. {}", GetErrorString(result)); Logger::warn(L"Failed to query service. {}", GetErrorString(result));
return false; return false;
@@ -64,14 +64,14 @@ namespace
CComPtr<IShellView> spView; CComPtr<IShellView> spView;
result = spBrowser->QueryActiveShellView(&spView); result = spBrowser->QueryActiveShellView(&spView);
if (result != S_OK) if (result != S_OK || spView == nullptr)
{ {
Logger::warn(L"Failed to query active shell window. {}", GetErrorString(result)); Logger::warn(L"Failed to query active shell window. {}", GetErrorString(result));
return false; return false;
} }
result = spView->QueryInterface(riid, ppv); result = spView->QueryInterface(riid, ppv);
if (result != S_OK) if (result != S_OK || ppv == nullptr || *ppv == nullptr )
{ {
Logger::warn(L"Failed to query interface. {}", GetErrorString(result)); Logger::warn(L"Failed to query interface. {}", GetErrorString(result));
return false; return false;