Nikolay Sivov : shell32: Remove menu insertion helper.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Tue Jan 10 15:53:55 2012 +0300

shell32: Remove menu insertion helper.

---

dlls/shell32/shv_item_cmenu.c |   36 ++++++++----------------------------
 1 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c
index 4c05460..ac91f37 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -158,33 +158,6 @@ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface)
    return refCount;
 }

-static void _InsertMenuItemW (
-	HMENU hmenu,
-	UINT indexMenu,
-	BOOL fByPosition,
-	UINT wID,
-	UINT fType,
-	LPWSTR dwTypeData,
-	UINT fState)
-{
-	MENUITEMINFOW	mii;
-
-	mii.cbSize = sizeof(mii);
-	if (fType == MFT_SEPARATOR)
-	{
-	  mii.fMask = MIIM_ID | MIIM_TYPE;
-	}
-	else
-	{
-	  mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE;
-	  mii.dwTypeData = dwTypeData;
-	  mii.fState = fState;
-	}
-	mii.wID = wID;
-	mii.fType = fType;
-	InsertMenuItemW( hmenu, indexMenu, fByPosition, &mii);
-}
-
 /**************************************************************************
 * ISvItemCm_fnQueryContextMenu()
 */
@@ -224,7 +197,14 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu(
             mi.cch = 255;
             GetMenuItemInfoW(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND, &mi);
             RemoveMenu(hmenu, FCIDM_SHVIEW_EXPLORE, MF_BYCOMMAND);
-            _InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, FCIDM_SHVIEW_EXPLORE, MFT_STRING, str, MFS_ENABLED);
+
+            mi.cbSize = sizeof(mi);
+            mi.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE;
+            mi.dwTypeData = str;
+            mi.fState = MFS_ENABLED;
+            mi.wID = FCIDM_SHVIEW_EXPLORE;
+            mi.fType = MFT_STRING;
+            InsertMenuItemW(hmenu, (uFlags & CMF_EXPLORE) ? 1 : 2, MF_BYPOSITION, &mi);
         }

SetMenuDefaultItem(hmenu, 0, MF_BYPOSITION);