[PATCH] shell32: handle no menus in WM_MENUCHAR (Coverity)

Marcus Meissner marcus at jet.franken.de
Sat Aug 6 07:01:48 CDT 2011


This probably does not happen, but just set hres to S_OK
in case.

CID 5256.

Ciao, Marcus
---
 dlls/shell32/shlmenu.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 4006807..166a3b3 100644
--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -1212,6 +1212,8 @@ static HRESULT WINAPI CompositeCMenu_HandleMenuMsg2(IContextMenu3 *iface, UINT u
     case WM_MENUCHAR:
         {
             UINT i=0;
+
+            hres = S_OK;
             for(;i<This->menu_count;i++)
             {
                 hres = IContextMenu_QueryInterface(This->menus[i],&IID_IContextMenu3,(void**)&handler);
@@ -1223,6 +1225,8 @@ static HRESULT WINAPI CompositeCMenu_HandleMenuMsg2(IContextMenu3 *iface, UINT u
                 }
             }
         }
+        FIXME("No menus - WM_MENUCHAR unhandled.\n");
+        return hres;
     default:
         WARN("Unimplemented uMsg: 0x%x\n",uMsg);
         return E_NOTIMPL;
-- 
1.7.3.4




More information about the wine-patches mailing list