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

[New+]Don't override New actions from Explorer on Windows 10 #36467

Merged
merged 5 commits into from
Dec 27, 2024
Merged

[New+]Don't override New actions from Explorer on Windows 10 #36467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62a1dc4
[New+]Don't override New actions from Explorer
jaimecbernardo Dec 20, 2024
ce9f568
Update src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_c…
jaimecbernardo Dec 20, 2024
3bfcb58
Update src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_c…
jaimecbernardo Dec 20, 2024
b8d5b59
Add pattern for learn.microsoft links
jaimecbernardo Dec 20, 2024
08deccf
Also only Query for context menu
jaimecbernardo Dec 20, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/spell-check/patterns.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ _mm_(?!dd)\w+

# hit-count: 4 file-count: 4
# microsoft
\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|developer|docs|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%]*
\b(?:https?://|)(?:(?:(?:blogs|download\.visualstudio|developer|docs|learn|msdn2?|research)\.|)microsoft|blogs\.msdn)\.co(?:m|\.\w\w)/[-_a-zA-Z0-9()=./%#]*

aka\.ms/[a-zA-Z0-9]+

Expand Down
11 changes: 9 additions & 2 deletions src/modules/NewPlus/NewShellExtensionContextMenu.win10/shell_context_menu_win10.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ IFACEMETHODIMP shell_context_menu_win10::QueryContextMenu(HMENU menu_handle, UIN
return E_FAIL;
}

if (menu_flags & CMF_DEFAULTONLY)
if (menu_flags & (CMF_DEFAULTONLY | CMF_VERBSONLY | CMF_OPTIMIZEFORINVOKE))
{
return MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_NULL, 0);
return E_UNEXPECTED;
}

try
Expand Down Expand Up @@ -217,6 +217,13 @@ IFACEMETHODIMP shell_context_menu_win10::InvokeCommand(CMINVOKECOMMANDINFO* para
return E_FAIL;
}

if (HIWORD(params->lpVerb)!=0)
{
// Not a menu command. It's likely a string verb command from another menu.
// The logic to interpret lpVerb is explained here: https://learn.microsoft.com/en-us/previous-versions//bb776881(v=vs.85)#invokecommand-method
return E_FAIL;
}

// Get selected menu item (a template or the "Open templates" item)
const auto selected_menu_item_index = LOWORD(params->lpVerb) - 1;
if (selected_menu_item_index < 0)
Expand Down
Loading