shell32: handle -1 return for GetMenuItemCount in Shell_MergeMenus. (coverity 231) Also include some beginning unit tests for the Shell_MergeMenus.

[Aric Stewart]

---
  dlls/shell32/shlmenu.c         |    3 +
  dlls/shell32/tests/Makefile.in |    1 +
  dlls/shell32/tests/shlmenu.c   |  128 
++++++++++++++++++++++++++++++++++++++++
  3 files changed, 132 insertions(+), 0 deletions(-)
  create mode 100644 dlls/shell32/tests/shlmenu.c


-------------- next part --------------
A non-text attachment was scrubbed...
Name: e7638517ee996554b9aa584050df731e5ba346bc.diff
Type: text/x-patch
Size: 4786 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20081003/9a1f3515/attachment.bin