Huw Davies : shell32: Use a MENUEX resource for the context menu.

[Alexandre Julliard]

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

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Apr 19 13:13:41 2017 +0100

shell32: Use a MENUEX resource for the context menu.

This ensures the submenus can be given ids below FCIDM_SHVIEWLAST and
so don't get stripped out by SHELL_MergeMenus().

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/shell32.rc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 82ad32a..6585416 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -35,11 +35,11 @@ END
 /*
  shellview background menu
 */
-MENU_002 MENU
+MENU_002 MENUEX
 BEGIN
 	POPUP ""
 	BEGIN
-	  POPUP "&View"
+	  POPUP "&View",                0x40   /* Submenus need ids <= FCIDM_SHVIEWLAST so they don't get removed by MergeMenu */
 	  BEGIN
 	    MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
 	    MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
@@ -47,7 +47,7 @@ BEGIN
 	    MENUITEM "&Details",	FCIDM_SHVIEW_REPORTVIEW
 	  END
 	  MENUITEM SEPARATOR
-	  POPUP "Arrange &Icons"
+	  POPUP "Arrange &Icons",       0x41
 	  BEGIN
 	    MENUITEM "By &Name",	0x30	/* column 0 */
 	    MENUITEM "By &Type",	0x32	/* column 2 */
@@ -63,7 +63,7 @@ BEGIN
 	  MENUITEM "Paste",		FCIDM_SHVIEW_INSERT
 	  MENUITEM "Paste as Link",	FCIDM_SHVIEW_INSERTLINK
 	  MENUITEM SEPARATOR
-	  POPUP "New"
+	  POPUP "New",                  0x42
 	  BEGIN
 	    MENUITEM "New &Folder",	FCIDM_SHVIEW_NEWFOLDER
 	    MENUITEM "New &Link",	FCIDM_SHVIEW_NEWLINK