Nikolay Sivov : shell32: Use IS_INTRESOURCE() to test context menu verb kind.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Fri Jun  9 02:36:16 2017 +0300

shell32: Use IS_INTRESOURCE() to test context menu verb kind.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/shell32/shlmenu.c       | 25 ++++++++++++++-----------
 dlls/shell32/shlview_cmenu.c |  6 +++---
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 7a960ad..39ab4c6 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -1114,25 +1114,28 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT
 static HRESULT WINAPI CompositeCMenu_InvokeCommand(IContextMenu3* iface,LPCMINVOKECOMMANDINFO pici)
 {
     CompositeCMenu *This = impl_from_IContextMenu3(iface);
-    TRACE("(%p)->(%p)\n",iface,pici);
-    if(HIWORD(pici->lpVerb))
+
+    TRACE("(%p)->(%p)\n", iface, pici);
+
+    if (IS_INTRESOURCE(pici->lpVerb))
+    {
+        UINT id = (UINT_PTR)pici->lpVerb;
+        UINT index = CompositeCMenu_GetIndexForCommandId(This, id);
+        return IContextMenu_InvokeCommand(This->menus[index], pici);
+    }
+    else
     {
         /*call each handler until one of them succeeds*/
-        UINT i=0;
-        for(;i<This->menu_count;i++)
+        UINT i;
+
+        for (i = 0; i < This->menu_count; i++)
         {
             HRESULT hres;
-            if(SUCCEEDED(hres=IContextMenu_InvokeCommand(This->menus[i],pici)))
+            if (SUCCEEDED(hres = IContextMenu_InvokeCommand(This->menus[i], pici)))
                 return hres;
         }
         return E_FAIL;
     }
-    else
-    {
-        UINT id = (UINT_PTR)pici->lpVerb;
-        UINT index = CompositeCMenu_GetIndexForCommandId(This,id);
-        return IContextMenu_InvokeCommand(This->menus[index],pici);
-    }
 }
 
 static HRESULT WINAPI CompositeCMenu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu,UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
index 099f5bc..5c5ba1b 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -397,13 +397,13 @@ static HRESULT WINAPI ItemMenu_InvokeCommand(
 
     TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
 
-    if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST)
+    if (IS_INTRESOURCE(lpcmi->lpVerb) && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST)
     {
-        TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb));
+        TRACE("Invalid Verb %x\n", LOWORD(lpcmi->lpVerb));
         return E_INVALIDARG;
     }
 
-    if (HIWORD(lpcmi->lpVerb) == 0)
+    if (IS_INTRESOURCE(lpcmi->lpVerb))
     {
         switch(LOWORD(lpcmi->lpVerb))
         {