shell32: Fix multiline trace message and some magic numbers.

This commit is contained in:
Nikolay Sivov 2015-05-04 18:03:33 +03:00 committed by Alexandre Julliard
parent a7b99a1f89
commit a897adb67b

View File

@ -2249,19 +2249,20 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec(
{ {
IShellViewImpl *This = impl_from_IOleCommandTarget(iface); IShellViewImpl *This = impl_from_IOleCommandTarget(iface);
FIXME("(%p)->(\n\tTarget GUID:%s Command:0x%08x Opt:0x%08x %p %p)\n", FIXME("(%p)->(%s %d 0x%08x %s %p)\n",
This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, pvaIn, pvaOut); This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, debugstr_variant(pvaIn), pvaOut);
if (!pguidCmdGroup) if (!pguidCmdGroup)
return OLECMDERR_E_UNKNOWNGROUP; return OLECMDERR_E_UNKNOWNGROUP;
if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) && if (IsEqualIID(pguidCmdGroup, &CGID_Explorer) &&
(nCmdID == 0x29) && (nCmdID == OLECMDID_SHOWMESSAGE) &&
(nCmdexecopt == 4) && pvaOut) (nCmdexecopt == 4) && pvaOut)
return S_OK; return S_OK;
if (IsEqualIID(pguidCmdGroup, &CGID_ShellDocView) && if (IsEqualIID(pguidCmdGroup, &CGID_ShellDocView) &&
(nCmdID == 9) && (nCmdID == OLECMDID_SPELL) &&
(nCmdexecopt == 0)) (nCmdexecopt == OLECMDEXECOPT_DODEFAULT))
return 1; return S_FALSE;
return OLECMDERR_E_UNKNOWNGROUP; return OLECMDERR_E_UNKNOWNGROUP;
} }