Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 14:43:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHLWAPI]

Browse source 
* Fix the right thing.

svn path=/branches/shell-experiments/; revision=62421
This commit is contained in:
David Quintana 2014-03-05 09:48:32 +00:00
parent 11e4273379
commit d77fcfc8c8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/shlwapi/ordinal.c
View file

@ -2911,7 +2911,7 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle
HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl) HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl)
{ {
TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl); TRACE("%p %p %p\n", hWnd, lpFolder, lpApidl);
return SHInvokeCommand(hWnd, lpFolder, lpApidl, TRUE); return SHInvokeCommand(hWnd, lpFolder, lpApidl, FALSE);
} }
/************************************************************************* /*************************************************************************
@ -3466,12 +3466,12 @@ UINT WINAPI SHDefExtractIconWrapW(LPCWSTR pszIconFile, int iIndex, UINT uFlags,
* executed. * executed.
* Failure: An HRESULT error code indicating the error. * Failure: An HRESULT error code indicating the error.
*/ */
HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, BOOL bInvokeDefault) HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST lpApidl, BOOL bQueryAllCommands)
{ {
IContextMenu *iContext; IContextMenu *iContext;
HRESULT hRet; HRESULT hRet;
TRACE("(%p, %p, %p, %d)\n", hWnd, lpFolder, lpApidl, bInvokeDefault); TRACE("(%p, %p, %p, %d)\n", hWnd, lpFolder, lpApidl, bQueryAllCommands);
if (!lpFolder) if (!lpFolder)
return E_FAIL; return E_FAIL;
@ -3489,11 +3489,11 @@ HRESULT WINAPI SHInvokeCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEMIDLIST
/* Add the context menu entries to the popup */ /* Add the context menu entries to the popup */
hQuery = IContextMenu_QueryContextMenu(iContext, hMenu, 0, 1, 0x7FFF, hQuery = IContextMenu_QueryContextMenu(iContext, hMenu, 0, 1, 0x7FFF,
bInvokeDefault ? CMF_NORMAL : CMF_DEFAULTONLY); bQueryAllCommands ? CMF_NORMAL : CMF_DEFAULTONLY);
if (SUCCEEDED(hQuery)) if (SUCCEEDED(hQuery))
{ {
if (bInvokeDefault && if (!bQueryAllCommands &&
(dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != (UINT)-1) (dwDefaultId = GetMenuDefaultItem(hMenu, 0, 0)) != (UINT)-1)
{ {
CMINVOKECOMMANDINFO cmIci; CMINVOKECOMMANDINFO cmIci;