Nikolay Sivov : shell32: Fix multiline trace message and some magic numbers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a897adb67b967a8e2245e167a9ea5753e3af3183
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a897adb67b967a8e2245e167a9...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon May  4 18:03:33 2015 +0300

shell32: Fix multiline trace message and some magic numbers.

---

 dlls/shell32/shlview.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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