Skip to content
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

Jump to bottom

Fix crash in explorer background context menu logic #8977

Merged
18 commits merged into from
Feb 1, 2021
Merged

Fix crash in explorer background context menu logic #8977

Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
60a612c
make open terminal here context menu for directory background
ihereafter Dec 23, 2020
cf274cc
fix missing new line
ihereafter Dec 23, 2020
a129ff1
code formating
ihereafter Dec 23, 2020
9abb707
spell checker
ihereafter Dec 23, 2020
443ac08
Update src/cascadia/ShellExtension/OpenTerminalHere.cpp
hereafter Dec 24, 2020
3469721
Update src/cascadia/ShellExtension/OpenTerminalHere.h
hereafter Dec 24, 2020
978392d
bug fix private function rename
ihereafter Dec 24, 2020
03a91ff
trivial
ihereafter Dec 24, 2020
8f73d59
revert vcpkg settings
ihereafter Jan 4, 2021
2e76c95
move user.lib linking to the project setting
ihereafter Jan 4, 2021
950515c
bug fixing
ihereafter Jan 4, 2021
192469c
update two other appxmanifest to enable folder background context menu
ihereafter Jan 5, 2021
e72cae4
merge
ihereafter Jan 31, 2021
9731011
fix crashing on create_instance, use try_create_instance instead, and…
ihereafter Jan 31, 2021
334afd8
fix not nullptr warning
ihereafter Jan 31, 2021
d9f198e
a few comments
ihereafter Jan 31, 2021
84d122c
trivial
ihereafter Jan 31, 2021
0df76d7
Spellcheck
carlos-zamora Feb 1, 2021
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
15 changes: 14 additions & 1 deletion src/cascadia/ShellExtension/OpenTerminalHere.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,16 @@ std::wstring OpenTerminalHere::_GetPathFromExplorer() const
return path;
}

auto shell = create_instance<IShellWindows>(CLSID_ShellWindows);
com_ptr<IShellWindows> shell;
try
{
shell = create_instance<IShellWindows>(CLSID_ShellWindows, CLSCTX_ALL);
}
catch (...)
{
//look like try_create_intance is not available no more
carlos-zamora marked this conversation as resolved.
Show resolved Hide resolved
}
zadjii-msft marked this conversation as resolved.
Show resolved Hide resolved

if (shell == nullptr)
{
return path;
Expand All @@ -285,6 +294,7 @@ std::wstring OpenTerminalHere::_GetPathFromExplorer() const
com_ptr<IWebBrowserApp> tmp;
if (FAILED(disp->QueryInterface(tmp.put())))
{
disp = nullptr; // get rid of DEBUG non-nullptr warning
continue;
}

Expand All @@ -293,8 +303,11 @@ std::wstring OpenTerminalHere::_GetPathFromExplorer() const
if (hwnd == tmpHWND)
{
browser = tmp;
disp = nullptr; // get rid of DEBUG non-nullptr warning
break; //found
}

disp = nullptr; // get rid of DEBUG non-nullptr warning
}

if (browser != nullptr)
Expand Down