shell32: Always use IContextMenu::InvokeCommand() when selecting an item from the context menu.

This reverts one of the changes included in d30dfd24. Relying on FCIDM_SHVIEW_OPEN snoops into the internals of IContextMenu for no good reason. While I haven't tested whether ICommDlgBrowser::OnDefaultCommand() is triggered in this case, the documentation states that it is "called when a user double-clicks in the view or presses the ENTER key"; this is neither scenario. Simply let the context menu call ShellExecuteEx().

shell32: Always use IContextMenu::InvokeCommand() when selecting an item from the context menu.
d9c4f506 · Zebediah Figura · Alexandre Julliard · f27e4a4a · d9c4f506
Commit d9c4f506 authored Feb 16, 2024 by Zebediah Figura Committed by Alexandre Julliard Feb 19, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 13 deletions

shlview.c dlls/shell32/shlview.c +0 -13

No files found.
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1055,24 +1055,11 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL 

 		if(uCommand > 0)
 		{
-		  TRACE("-- uCommand=%u\n", uCommand);
-		  if (uCommand==FCIDM_SHVIEW_OPEN && IsInCommDlg(This))
-		  {
-		    TRACE("-- dlg: OnDefaultCommand\n");
-		    if (OnDefaultCommand(This) != S_OK)
-		    {
-		      ShellView_OpenSelectedItems(This);
-		    }
-		  }
-		  else
-		  {
-		    TRACE("-- explore -- invoke command\n");
 		    ZeroMemory(&cmi, sizeof(cmi));
 		    cmi.cbSize = sizeof(cmi);
 		    cmi.hwnd = This->hWndParent; /* this window has to answer CWM_GETISHELLBROWSER */
                    cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
 		    IContextMenu_InvokeCommand(pContextMenu, &cmi);
-		  }
 		}
 		DestroyMenu(hMenu);
 	      }