If ICommDlgBrowser_OnDefaultCommand returns anything other than S_OK

then we should call the default handler.

If ICommDlgBrowser_OnDefaultCommand returns anything other than S_OK
52cf1992 · Huw Davies · Alexandre Julliard · ea84f493 · 52cf1992
Commit 52cf1992 authored Apr 12, 2005 by Huw Davies Committed by Alexandre Julliard Apr 12, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shlview.c dlls/shell32/shlview.c +2 -2

No files found.
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -217,7 +217,7 @@ static HRESULT OnDefaultCommand(IShellViewImpl * This)
 	{
 	  TRACE("ICommDlgBrowser::OnDefaultCommand\n");
 	  ret = ICommDlgBrowser_OnDefaultCommand(This->pCommDlgBrowser, (IShellView*)This);
-	  TRACE("--\n");
+	  TRACE("-- returns %08lx\n", ret);
 	}
 	return ret;
 }
@@ -962,7 +962,7 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL 
 		  if (uCommand==FCIDM_SHVIEW_OPEN && IsInCommDlg(This))
 		  {
 		    TRACE("-- dlg: OnDefaultCommand\n");
-		    if (FAILED(OnDefaultCommand(This)))
+		    if (OnDefaultCommand(This) != S_OK)
 		    {
 		      ShellView_OpenSelectedItems(This);
 		    }