diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp
index 7cf9160df58..56a47f34dbb 100644
--- a/dll/win32/shell32/CDefView.cpp
+++ b/dll/win32/shell32/CDefView.cpp
@@ -1664,10 +1664,7 @@ LRESULT CDefView::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &b
     if (uCommand == 0)
         return 0;
 
-    if (uCommand == FCIDM_SHVIEW_OPEN && OnDefaultCommand() == S_OK)
-        return 0;
-
-    InvokeContextMenuCommand(m_pCM, uCommand - CONTEXT_MENU_BASE_ID, &pt);
+    InvokeContextMenuCommand(m_pCM, uCommand, &pt);
 
     return 0;
 }
diff --git a/dll/win32/shell32/CDefViewBckgrndMenu.cpp b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
index 70abed2e754..ce9be3fefd5 100644
--- a/dll/win32/shell32/CDefViewBckgrndMenu.cpp
+++ b/dll/win32/shell32/CDefViewBckgrndMenu.cpp
@@ -10,6 +10,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
+UINT APIENTRY RemapMenuIDs(HMENU hMenu, UINT idCmdFirst, UINT idCmdLast);
+UINT APIENTRY GetUnmappedIDFromMenu(HMENU hMenu, UINT idCmd);
+
 class CDefViewBckgrndMenu :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
     public IContextMenu3,
@@ -20,8 +23,7 @@ class CDefViewBckgrndMenu :
         CComPtr<IShellFolder> m_psf;
         CComPtr<IContextMenu> m_folderCM;
 
-        UINT m_idCmdFirst;
-        UINT m_LastFolderCMId;
+        HMENU m_hMenuCM;
 
         BOOL _bIsDesktopBrowserMenu();
         BOOL _bCanPaste();
@@ -55,12 +57,13 @@ class CDefViewBckgrndMenu :
 
 CDefViewBckgrndMenu::CDefViewBckgrndMenu()
 {
-    m_idCmdFirst = 0;
-    m_LastFolderCMId = 0;
+    m_hMenuCM = NULL;
 }
 
 CDefViewBckgrndMenu::~CDefViewBckgrndMenu()
 {
+    if (m_hMenuCM)
+        ::DestroyMenu(m_hMenuCM);
 }
 
 BOOL CDefViewBckgrndMenu::_bIsDesktopBrowserMenu()
@@ -147,30 +150,18 @@ HRESULT
 WINAPI
 CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
 {
+    idCmdFirst = 0; /* Ignore */
+
     HRESULT hr;
-    HMENU hMenuPart;
-    UINT cIds = 0;
-
-    /* This is something the implementations of IContextMenu should never really do.
-       However CDefViewBckgrndMenu is more or less an overengineering result, its code could really be part of the
-       CDefView. Given this, I think that abusing the interface here is not that bad since only CDefView is the ony
-       user of this class. Here we need to do two things to keep things as simple as possible.
-       First we want the menu part added by the shell folder to be the first to add so as to make as few id translations
-       as possible. Second, we want to add the default part of the background menu without shifted ids, so as
-       to let the CDefView fill some parts like filling the arrange modes or checking the view mode. In order
-       for that to work we need to save idCmdFirst because our caller will pass id offsets to InvokeCommand.
-       This makes it impossible to concatenate the CDefViewBckgrndMenu with other menus since it abuses IContextMenu
-       but as stated above, its sole user is CDefView and should really be that way. */
-    m_idCmdFirst = idCmdFirst;
+    UINT idCmdNext = idCmdFirst;
 
     /* Let the shell folder add any items it wants to add in the background context menu */
     if (m_folderCM)
     {
-        hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags);
+        hr = m_folderCM->QueryContextMenu(hMenu, indexMenu, idCmdNext, idCmdLast, uFlags);
         if (SUCCEEDED(hr))
         {
-            m_LastFolderCMId = LOWORD(hr);
-            cIds = m_LastFolderCMId;
+            idCmdNext = HRESULT_CODE(hr);
         }
         else
         {
@@ -182,33 +173,39 @@ CDefViewBckgrndMenu::QueryContextMenu(HMENU hMenu, UINT indexMenu, UINT idCmdFir
         WARN("GetUIObjectOf didn't give any context menu!\n");
     }
 
+    if (m_hMenuCM)
+        ::DestroyMenu(m_hMenuCM);
+
     /* Load the default part of the background context menu */
-    hMenuPart = LoadMenuW(shell32_hInstance, L"MENU_002");
-    if (hMenuPart)
+    m_hMenuCM = LoadMenuW(shell32_hInstance, L"MENU_002");
+    if (m_hMenuCM)
     {
         /* Don't show the view submenu for the desktop */
         if (_bIsDesktopBrowserMenu())
         {
-            DeleteMenu(hMenuPart, FCIDM_SHVIEW_VIEW, MF_BYCOMMAND);
+            DeleteMenu(m_hMenuCM, FCIDM_SHVIEW_VIEW, MF_BYCOMMAND);
         }
 
         /* Disable the paste options if it is not possible */
         if (!_bCanPaste())
         {
-            EnableMenuItem(hMenuPart, FCIDM_SHVIEW_INSERT, MF_BYCOMMAND | MF_GRAYED);
-            EnableMenuItem(hMenuPart, FCIDM_SHVIEW_INSERTLINK, MF_BYCOMMAND | MF_GRAYED);
+            EnableMenuItem(m_hMenuCM, FCIDM_SHVIEW_INSERT, MF_BYCOMMAND | MF_GRAYED);
+            EnableMenuItem(m_hMenuCM, FCIDM_SHVIEW_INSERTLINK, MF_BYCOMMAND | MF_GRAYED);
         }
 
+        HMENU hSubMenu = GetSubMenu(m_hMenuCM, 0);
+        idCmdNext += ::RemapMenuIDs(hSubMenu, idCmdNext, idCmdLast);
+
         /* merge general background context menu in */
-        Shell_MergeMenus(hMenu, GetSubMenu(hMenuPart, 0), indexMenu, 0, idCmdLast, MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS | MM_ADDSEPARATOR);
-        DestroyMenu(hMenuPart);
+        Shell_MergeMenus(hMenu, hSubMenu, indexMenu, 0, 0xFFFF,
+                         MM_DONTREMOVESEPS | MM_SUBMENUSHAVEIDS | MM_ADDSEPARATOR);
     }
     else
     {
         ERR("Failed to load menu from resource!\n");
     }
 
-    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds);
+    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst);
 }
 
 HRESULT
@@ -216,28 +213,26 @@ WINAPI
 CDefViewBckgrndMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi)
 {
     UINT idCmd = LOWORD(lpcmi->lpVerb);
+    ERR("idCmd %d\n", idCmd);
 
-    if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWLISTA))
-    {
-        idCmd = FCIDM_SHVIEW_LISTVIEW;
-    }
-    else if (HIWORD(lpcmi->lpVerb) && !strcmp(lpcmi->lpVerb, CMDSTR_VIEWDETAILSA))
-    {
-        idCmd = FCIDM_SHVIEW_REPORTVIEW;
-    }
-    else if(HIWORD(lpcmi->lpVerb) != 0 || idCmd < m_LastFolderCMId)
+    if (HIWORD(lpcmi->lpVerb))
     {
-        if (m_folderCM)
+        if (!strcmp(lpcmi->lpVerb, CMDSTR_VIEWLISTA))
         {
-            return m_folderCM->InvokeCommand(lpcmi);
+            idCmd = FCIDM_SHVIEW_LISTVIEW;
+        }
+        else if (!strcmp(lpcmi->lpVerb, CMDSTR_VIEWDETAILSA))
+        {
+            idCmd = FCIDM_SHVIEW_REPORTVIEW;
         }
-        WARN("m_folderCM is NULL!\n");
-        return E_NOTIMPL;
     }
     else
     {
-        /* The default part of the background menu doesn't have shifted ids so we need to convert the id offset to the real id */
-        idCmd += m_idCmdFirst;
+        HMENU hSubMenu = GetSubMenu(m_hMenuCM, 0);
+        idCmd = ::GetUnmappedIDFromMenu(hSubMenu, idCmd);
+        ERR("idCmd %d\n", idCmd);
+        if (idCmd == (UINT)-1)
+            return E_FAIL;
     }
 
     /* The commands that are handled by the def view are forwarded to it */
diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp
index 2559e6e0438..d74dd783bb5 100644
--- a/dll/win32/shell32/CDefaultContextMenu.cpp
+++ b/dll/win32/shell32/CDefaultContextMenu.cpp
@@ -68,15 +68,16 @@ class CDefaultContextMenu :
         PIDLIST_ABSOLUTE m_pidlFolder;
         DWORD m_bGroupPolicyActive;
         CAtlList<DynamicShellEntry> m_DynamicEntries;
-        UINT m_iIdSHEFirst; /* first used id */
-        UINT m_iIdSHELast; /* last used id */
+        UINT m_idDynamicFirst; /* first used index */
+        UINT m_idDynamicEnd; /* last used index - 1 */
         CAtlList<StaticShellEntry> m_StaticEntries;
-        UINT m_iIdSCMFirst; /* first static used id */
-        UINT m_iIdSCMLast; /* last static used id */
-        UINT m_iIdCBFirst; /* first callback used id */
-        UINT m_iIdCBLast;  /* last callback used id */
-        UINT m_iIdDfltFirst; /* first default part id */
-        UINT m_iIdDfltLast; /* last default part id */
+        UINT m_idStaticFirst; /* first static used index */
+        UINT m_idStaticEnd; /* last static used index - 1 */
+        UINT m_idCBFirst; /* first callback used index */
+        UINT m_idCBEnd;  /* last callback used index - 1 */
+        UINT m_idDefaultFirst; /* first default part id */
+        UINT m_idDefaultEnd; /* last default part index - 1 */
+        HMENU m_hDefaultMenu;
 
         HRESULT _DoCallback(UINT uMsg, WPARAM wParam, LPVOID lParam);
         void AddStaticEntry(const HKEY hkeyClass, const WCHAR *szVerb);
@@ -143,19 +144,23 @@ CDefaultContextMenu::CDefaultContextMenu() :
     m_cKeys(NULL),
     m_pidlFolder(NULL),
     m_bGroupPolicyActive(0),
-    m_iIdSHEFirst(0),
-    m_iIdSHELast(0),
-    m_iIdSCMFirst(0),
-    m_iIdSCMLast(0),
-    m_iIdCBFirst(0),
-    m_iIdCBLast(0),
-    m_iIdDfltFirst(0),
-    m_iIdDfltLast(0)
+    m_idDynamicFirst(0),
+    m_idDynamicEnd(0),
+    m_idStaticFirst(0),
+    m_idStaticEnd(0),
+    m_idCBFirst(0),
+    m_idCBEnd(0),
+    m_idDefaultFirst(0),
+    m_idDefaultEnd(0),
+    m_hDefaultMenu(NULL)
 {
 }
 
 CDefaultContextMenu::~CDefaultContextMenu()
 {
+    if (m_hDefaultMenu)
+        ::DestroyMenu(m_hDefaultMenu);
+
     m_DynamicEntries.RemoveAll();
     m_StaticEntries.RemoveAll();
 
@@ -433,7 +438,7 @@ CDefaultContextMenu::AddShellExtensionsToMenu(HMENU hMenu, UINT* pIndexMenu, UIN
         if (SUCCEEDED(hr))
         {
             info.iIdCmdFirst = cIds;
-            info.NumIds = HRESULT_CODE(hr);
+            info.NumIds = HRESULT_CODE(hr) - (idCmdFirst + cIds);
             (*pIndexMenu) += info.NumIds;
 
             cIds += info.NumIds;
@@ -607,6 +612,49 @@ void WINAPI _InsertMenuItemW(
     InsertMenuItemW(hMenu, indexMenu, fByPosition, &mii);
 }
 
+UINT APIENTRY RemapMenuIDs(HMENU hMenu, UINT idCmdFirst, UINT idCmdLast)
+{
+    UINT iItem, cItems = ::GetMenuItemCount(hMenu), idCmdNext = idCmdFirst;
+    MENUITEMINFOW mii = { sizeof(mii), MIIM_ID | MIIM_FTYPE | MIIM_DATA | MIIM_SUBMENU };
+    for (iItem = 0; iItem < cItems; ++iItem)
+    {
+        ::GetMenuItemInfoW(hMenu, iItem, TRUE, &mii);
+        if (mii.hSubMenu)
+        {
+            idCmdNext += RemapMenuIDs(mii.hSubMenu, idCmdNext, idCmdLast);
+        }
+        else if (mii.fType != MFT_SEPARATOR)
+        {
+            mii.dwItemData = mii.wID;
+            mii.wID = idCmdNext++;
+            ::SetMenuItemInfoW(hMenu, iItem, TRUE, &mii);
+        }
+    }
+    return idCmdNext - idCmdFirst;
+}
+
+UINT APIENTRY GetUnmappedIDFromMenu(HMENU hMenu, UINT idCmd)
+{
+    UINT iItem, cItems = ::GetMenuItemCount(hMenu);
+    MENUITEMINFOW mii = { sizeof(mii), MIIM_ID | MIIM_FTYPE | MIIM_DATA | MIIM_SUBMENU };
+    for (iItem = 0; iItem < cItems; ++iItem)
+    {
+        ::GetMenuItemInfoW(hMenu, iItem, TRUE, &mii);
+        if (mii.hSubMenu)
+        {
+            INT ret = GetUnmappedIDFromMenu(mii.hSubMenu, idCmd);
+            if (ret != -1)
+                return ret;
+        }
+        else if (mii.fType != MFT_SEPARATOR)
+        {
+            if (idCmd == mii.wID)
+                return mii.dwItemData;
+        }
+    }
+    return -1; /* Invalid ID */
+}
+
 HRESULT
 WINAPI
 CDefaultContextMenu::QueryContextMenu(
@@ -617,8 +665,8 @@ CDefaultContextMenu::QueryContextMenu(
     UINT uFlags)
 {
     HRESULT hr;
-    UINT idCmdNext = idCmdFirst;
-    UINT cIds = 0;
+    UINT idCmdNext = idCmdFirst; /* The next available free command id */
+    UINT added;
 
     TRACE("BuildShellItemContextMenu entered\n");
 
@@ -630,70 +678,75 @@ CDefaultContextMenu::QueryContextMenu(
     }
 
     /* Add static context menu handlers */
-    cIds = AddStaticContextMenusToMenu(hMenu, &IndexMenu, idCmdFirst, idCmdLast);
-    m_iIdSCMFirst = 0;
-    m_iIdSCMLast = cIds;
-    idCmdNext = idCmdFirst + cIds;
+    added = AddStaticContextMenusToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast);
+    m_idStaticFirst = idCmdNext;
+    m_idStaticEnd = idCmdNext + added;
+    idCmdNext += added;
 
     /* Add dynamic context menu handlers */
-    cIds += AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast, uFlags);
-    m_iIdSHEFirst = m_iIdSCMLast;
-    m_iIdSHELast = cIds;
-    idCmdNext = idCmdFirst + cIds;
-    TRACE("SH_LoadContextMenuHandlers first %x last %x\n", m_iIdSHEFirst, m_iIdSHELast);
+    added = AddShellExtensionsToMenu(hMenu, &IndexMenu, idCmdNext, idCmdLast, uFlags);
+    m_idDynamicFirst = idCmdNext;
+    m_idDynamicEnd = idCmdNext + added;
+    idCmdNext += added;
+    TRACE("SH_LoadContextMenuHandlers first %x end %x\n", m_idDynamicFirst, m_idDynamicEnd);
 
     /* Now let the callback add its own items */
     QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL};
     if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo)))
     {
-        UINT added = qcminfo.idCmdFirst - idCmdNext;
-        cIds += added;
+        added = qcminfo.idCmdFirst - idCmdNext;
+        m_idCBFirst = idCmdNext;
+        m_idCBEnd = idCmdNext + added;
+        idCmdNext += added;
         IndexMenu += added;
-        m_iIdCBFirst = m_iIdSHELast;
-        m_iIdCBLast = cIds;
-        idCmdNext = idCmdFirst + cIds;
     }
 
+    ERR("m_idStaticFirst %d, m_idDynamicFirst %d, m_idCBFirst %d\n", m_idStaticFirst, m_idDynamicFirst, m_idCBFirst);
+
     if (uFlags & CMF_VERBSONLY)
-        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds);
+        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst);
 
     /* If this is a background context menu we are done */
     if (!m_cidl)
-        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds);
+        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst);
 
     /* Get the attributes of the items */
     SFGAOF rfg = SFGAO_BROWSABLE | SFGAO_CANCOPY | SFGAO_CANLINK | SFGAO_CANMOVE | SFGAO_CANDELETE | SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_FILESYSTEM | SFGAO_FOLDER;
     hr = m_psf->GetAttributesOf(m_cidl, m_apidl, &rfg);
     if (FAILED_UNEXPECTEDLY(hr))
-        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds);
+        return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst);
 
+    if (m_hDefaultMenu)
+        ::DestroyMenu(m_hDefaultMenu);
     /* Add the default part of the menu */
-    HMENU hmenuDefault = LoadMenu(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE");
+    m_hDefaultMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), L"MENU_SHV_FILE");
 
     /* Remove uneeded entries */
     if (!(rfg & SFGAO_CANMOVE))
-        DeleteMenu(hmenuDefault, IDM_CUT, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_CUT, MF_BYCOMMAND);
     if (!(rfg & SFGAO_CANCOPY))
-        DeleteMenu(hmenuDefault, IDM_COPY, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_COPY, MF_BYCOMMAND);
     if (!((rfg & SFGAO_FILESYSTEM) && HasClipboardData()))
-        DeleteMenu(hmenuDefault, IDM_INSERT, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_INSERT, MF_BYCOMMAND);
     if (!(rfg & SFGAO_CANLINK))
-        DeleteMenu(hmenuDefault, IDM_CREATELINK, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_CREATELINK, MF_BYCOMMAND);
     if (!(rfg & SFGAO_CANDELETE))
-        DeleteMenu(hmenuDefault, IDM_DELETE, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_DELETE, MF_BYCOMMAND);
     if (!(rfg & SFGAO_CANRENAME))
-        DeleteMenu(hmenuDefault, IDM_RENAME, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_RENAME, MF_BYCOMMAND);
     if (!(rfg & SFGAO_HASPROPSHEET))
-        DeleteMenu(hmenuDefault, IDM_PROPERTIES, MF_BYCOMMAND);
+        DeleteMenu(m_hDefaultMenu, FCIDM_SHVIEW_PROPERTIES, MF_BYCOMMAND);
 
-    UINT idMax = Shell_MergeMenus(hMenu, GetSubMenu(hmenuDefault, 0), IndexMenu, idCmdNext, idCmdLast, 0);
-    m_iIdDfltFirst = cIds;
-    cIds += idMax - idCmdNext;
-    m_iIdDfltLast = cIds;
+    HMENU hSubMenu = GetSubMenu(m_hDefaultMenu, 0);
+    added = ::RemapMenuIDs(hSubMenu, idCmdNext, idCmdLast);
+    Shell_MergeMenus(hMenu, hSubMenu, IndexMenu, 0, 0xFFFF, 0);
+    m_idDefaultFirst = idCmdNext;
+    m_idDefaultEnd = idCmdNext + added;
+    idCmdNext += added;
 
-    DestroyMenu(hmenuDefault);
+    ERR("m_idDefaultFirst %d, m_idDefaultEnd %d, added %d\n", m_idDefaultFirst , m_idDefaultEnd, added);
 
-    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, cIds);
+    return MAKE_HRESULT(SEVERITY_SUCCESS, 0, idCmdNext - idCmdFirst);
 }
 
 HRESULT CDefaultContextMenu::DoPaste(LPCMINVOKECOMMANDINFOEX lpcmi, BOOL bLink)
@@ -1012,7 +1065,7 @@ HRESULT
 CDefaultContextMenu::InvokeShellExt(
     LPCMINVOKECOMMANDINFOEX lpcmi)
 {
-    TRACE("verb %p first %x last %x\n", lpcmi->lpVerb, m_iIdSHEFirst, m_iIdSHELast);
+    TRACE("verb %p first %x end %x\n", lpcmi->lpVerb, m_idDynamicFirst, m_idDynamicEnd);
 
     UINT idCmd = LOWORD(lpcmi->lpVerb);
     PDynamicShellEntry pEntry = GetDynamicEntry(idCmd);
@@ -1192,32 +1245,33 @@ CDefaultContextMenu::InvokeCommand(
     }
 
     CmdId = LOWORD(LocalInvokeInfo.lpVerb);
+    ERR("CmdId: %d\n", CmdId);
 
-    if (!m_DynamicEntries.IsEmpty() && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast)
+    if (!m_DynamicEntries.IsEmpty() && m_idDynamicFirst <= CmdId && CmdId < m_idDynamicEnd)
     {
-        LocalInvokeInfo.lpVerb -= m_iIdSHEFirst;
+        LocalInvokeInfo.lpVerb -= m_idDynamicFirst;
         Result = InvokeShellExt(&LocalInvokeInfo);
         return Result;
     }
 
-    if (!m_StaticEntries.IsEmpty() && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast)
+    if (!m_StaticEntries.IsEmpty() && m_idStaticFirst <= CmdId && CmdId < m_idStaticEnd)
     {
-        LocalInvokeInfo.lpVerb -= m_iIdSCMFirst;
+        LocalInvokeInfo.lpVerb -= m_idStaticFirst;
         Result = InvokeRegVerb(&LocalInvokeInfo);
         return Result;
     }
 
-    if (m_iIdCBFirst != m_iIdCBLast && CmdId >= m_iIdCBFirst && CmdId < m_iIdCBLast)
+    if (m_idCBFirst <= CmdId && CmdId < m_idCBEnd)
     {
-        Result = _DoCallback(DFM_INVOKECOMMAND, CmdId - m_iIdCBFirst, NULL);
+        Result = _DoCallback(DFM_INVOKECOMMAND, CmdId - m_idCBFirst, NULL);
         return Result;
     }
 
-    if (m_iIdDfltFirst != m_iIdDfltLast && CmdId >= m_iIdDfltFirst && CmdId < m_iIdDfltLast)
+    if (m_idDefaultFirst <= CmdId && CmdId < m_idDefaultEnd)
     {
-        CmdId -= m_iIdDfltFirst;
-        /* See the definitions of IDM_CUT and co to see how this works */
-        CmdId += 0x7000;
+        HMENU hSubMenu = GetSubMenu(m_hDefaultMenu, 0);
+        CmdId = ::GetUnmappedIDFromMenu(hSubMenu, CmdId);
+        ERR("CmdId: %d\n", CmdId);
     }
 
     if (LocalInvokeInfo.cbSize >= sizeof(CMINVOKECOMMANDINFOEX) && (LocalInvokeInfo.fMask & CMIC_MASK_PTINVOKE))
@@ -1297,9 +1351,9 @@ CDefaultContextMenu::GetCommandString(
 
     UINT CmdId = LOWORD(idCommand);
 
-    if (!m_DynamicEntries.IsEmpty() && CmdId >= m_iIdSHEFirst && CmdId < m_iIdSHELast)
+    if (!m_DynamicEntries.IsEmpty() && m_idDynamicFirst <= CmdId && CmdId < m_idDynamicEnd)
     {
-        idCommand -= m_iIdSHEFirst;
+        idCommand -= m_idDynamicFirst;
         PDynamicShellEntry pEntry = GetDynamicEntry(idCommand);
         if (!pEntry)
             return E_FAIL;
@@ -1312,13 +1366,13 @@ CDefaultContextMenu::GetCommandString(
                                              uMaxNameLen);
     }
 
-    if (!m_StaticEntries.IsEmpty() && CmdId >= m_iIdSCMFirst && CmdId < m_iIdSCMLast)
+    if (!m_StaticEntries.IsEmpty() && m_idStaticFirst <= CmdId && CmdId < m_idStaticEnd)
     {
         /* Validation just returns S_OK on a match. The id exists. */
         if (uFlags == GCS_VALIDATEA || uFlags == GCS_VALIDATEW)
             return S_OK;
 
-        CmdId -= m_iIdSCMFirst;
+        CmdId -= m_idStaticFirst;
 
         POSITION it = m_StaticEntries.FindIndex(CmdId);
 
@@ -1340,9 +1394,9 @@ CDefaultContextMenu::GetCommandString(
     }
 
     //FIXME: Should we handle callbacks here?
-    if (m_iIdDfltFirst != m_iIdDfltLast && CmdId >= m_iIdDfltFirst && CmdId < m_iIdDfltLast)
+    if (m_idDefaultFirst <= CmdId && CmdId < m_idDefaultEnd)
     {
-        CmdId -= m_iIdDfltFirst;
+        CmdId -= m_idDefaultFirst;
         /* See the definitions of IDM_CUT and co to see how this works */
         CmdId += 0x7000;
     }
@@ -1443,10 +1497,10 @@ CDefaultContextMenu::HandleMenuMsg2(
     if (FAILED(hr))
         return S_FALSE;
 
-    if (CmdId < m_iIdSHEFirst || CmdId >= m_iIdSHELast)
+    if (!(m_idDynamicFirst <= CmdId && CmdId < m_idDynamicEnd))
         return S_FALSE;
 
-    CmdId -= m_iIdSHEFirst;
+    CmdId -= m_idDynamicFirst;
     PDynamicShellEntry pEntry = GetDynamicEntry(CmdId);
     if (pEntry)
     {
diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp
index 16b6b701f5b..0b4f53e2c76 100644
--- a/dll/win32/shell32/folders/CDrivesFolder.cpp
+++ b/dll/win32/shell32/folders/CDrivesFolder.cpp
@@ -1261,7 +1261,7 @@ HRESULT WINAPI CDrivesFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataO
             HMENU hpopup = CreatePopupMenu();
             _InsertMenuItemW(hpopup, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); // #0
             _InsertMenuItemW(hpopup, 1, TRUE, 1, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED); // #1
-            Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu++, pqcminfo->idCmdFirst, pqcminfo->idCmdLast, MM_ADDSEPARATOR);
+            Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu, pqcminfo->idCmdFirst++, pqcminfo->idCmdLast, MM_ADDSEPARATOR);
             DestroyMenu(hpopup);
         }
 
diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp
index 95ba3b95f6c..100be66c67e 100644
--- a/dll/win32/shell32/folders/CFSFolder.cpp
+++ b/dll/win32/shell32/folders/CFSFolder.cpp
@@ -1835,7 +1835,7 @@ HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObjec
             QCMINFO *pqcminfo = (QCMINFO *)lParam;
             HMENU hpopup = CreatePopupMenu();
             _InsertMenuItemW(hpopup, 0, TRUE, 0, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED);
-            Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu++, pqcminfo->idCmdFirst, pqcminfo->idCmdLast, MM_ADDSEPARATOR);
+            Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu, pqcminfo->idCmdFirst++, pqcminfo->idCmdLast, MM_ADDSEPARATOR);
             DestroyMenu(hpopup);
         }
 
diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc
index 889ca032828..606013c30a6 100644
--- a/dll/win32/shell32/lang/bg-BG.rc
+++ b/dll/win32/shell32/lang/bg-BG.rc
@@ -65,15 +65,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Из&рязване", IDM_CUT
-        MENUITEM "За&помняне", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Из&рязване", FCIDM_SHVIEW_CUT
+        MENUITEM "За&помняне", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Създаване на &връзка", IDM_CREATELINK
-        MENUITEM "Из&триване", IDM_DELETE
-        MENUITEM "Пре&именуване", IDM_RENAME
+        MENUITEM "Създаване на &връзка", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "Из&триване", FCIDM_SHVIEW_DELETE
+        MENUITEM "Пре&именуване", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Свойства", IDM_PROPERTIES
+        MENUITEM "&Свойства", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc
index cb45cb2c1be..dff35b092da 100644
--- a/dll/win32/shell32/lang/ca-ES.rc
+++ b/dll/win32/shell32/lang/ca-ES.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "C&ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc
index 585feead1c6..610995d0cd4 100644
--- a/dll/win32/shell32/lang/cs-CZ.rc
+++ b/dll/win32/shell32/lang/cs-CZ.rc
@@ -70,15 +70,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Vyj&mout", IDM_CUT
-        MENUITEM "&Kopírovat", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Vyj&mout", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopírovat", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Vytvořit zástupc&e", IDM_CREATELINK
-        MENUITEM "O&dstranit", IDM_DELETE
-        MENUITEM "&Přejmenovat", IDM_RENAME
+        MENUITEM "Vytvořit zástupc&e", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "O&dstranit", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Přejmenovat", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Vlastnosti", IDM_PROPERTIES
+        MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc
index 150485e6b78..b3e04739d89 100644
--- a/dll/win32/shell32/lang/da-DK.rc
+++ b/dll/win32/shell32/lang/da-DK.rc
@@ -70,15 +70,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "K&lip", IDM_CUT
-        MENUITEM "&Kopiere", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "K&lip", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopiere", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Opret &Link", IDM_CREATELINK
-        MENUITEM "&Slet", IDM_DELETE
-        MENUITEM "&Omdøb", IDM_RENAME
+        MENUITEM "Opret &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Slet", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Omdøb", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Egenskabe", IDM_PROPERTIES
+        MENUITEM "&Egenskabe", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc
index cef3e293e0d..a7cd6a7989b 100644
--- a/dll/win32/shell32/lang/de-DE.rc
+++ b/dll/win32/shell32/lang/de-DE.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Ausschneiden", IDM_CUT
-        MENUITEM "&Kopieren", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "&Ausschneiden", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "&Verknüpfung erstellen", IDM_CREATELINK
-        MENUITEM "&Löschen", IDM_DELETE
-        MENUITEM "&Umbenennen", IDM_RENAME
+        MENUITEM "&Verknüpfung erstellen", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Löschen", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Umbenennen", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Eigenschaften", IDM_PROPERTIES
+        MENUITEM "&Eigenschaften", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc
index e9f7631ff40..291e43d76b5 100644
--- a/dll/win32/shell32/lang/el-GR.rc
+++ b/dll/win32/shell32/lang/el-GR.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Α&ποκοπή", IDM_CUT
-        MENUITEM "Α&ντιγραφή", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Α&ποκοπή", FCIDM_SHVIEW_CUT
+        MENUITEM "Α&ντιγραφή", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Δημιουργία &συντόμευσης", IDM_CREATELINK
-        MENUITEM "&Διαγραφή", IDM_DELETE
-        MENUITEM "&Μετονομασία", IDM_RENAME
+        MENUITEM "Δημιουργία &συντόμευσης", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Διαγραφή", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Μετονομασία", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Ιδιότητες", IDM_PROPERTIES
+        MENUITEM "&Ιδιότητες", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc
index cf7b1bcb2b4..cd38f00f2d8 100644
--- a/dll/win32/shell32/lang/en-GB.rc
+++ b/dll/win32/shell32/lang/en-GB.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "C&ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc
index 0370c2a3b91..4dfffffff5d 100644
--- a/dll/win32/shell32/lang/en-US.rc
+++ b/dll/win32/shell32/lang/en-US.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Cu&t", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Cu&t", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc
index dfbe955e01b..71c03b11925 100644
--- a/dll/win32/shell32/lang/es-ES.rc
+++ b/dll/win32/shell32/lang/es-ES.rc
@@ -73,15 +73,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ortar", IDM_CUT
-        MENUITEM "&Copiar", IDM_COPY
-        MENUITEM "Pegar", IDM_INSERT
+        MENUITEM "C&ortar", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copiar", FCIDM_SHVIEW_COPY
+        MENUITEM "Pegar", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "C&rear acceso directo", IDM_CREATELINK
-        MENUITEM "&Eliminar", IDM_DELETE
-        MENUITEM "Re&nombrar", IDM_RENAME
+        MENUITEM "C&rear acceso directo", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Eliminar", FCIDM_SHVIEW_DELETE
+        MENUITEM "Re&nombrar", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Propiedades", IDM_PROPERTIES
+        MENUITEM "&Propiedades", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc
index cfab4569ab2..90e7bf4a76e 100644
--- a/dll/win32/shell32/lang/et-EE.rc
+++ b/dll/win32/shell32/lang/et-EE.rc
@@ -71,15 +71,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Lõika", IDM_CUT
-        MENUITEM "&Kopeeri", IDM_COPY
-        MENUITEM "Kleebi", IDM_INSERT
+        MENUITEM "&Lõika", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopeeri", FCIDM_SHVIEW_COPY
+        MENUITEM "Kleebi", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Koo&sta link", IDM_CREATELINK
-        MENUITEM "Kus&tuta", IDM_DELETE
-        MENUITEM "Nimeta &ümber", IDM_RENAME
+        MENUITEM "Koo&sta link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "Kus&tuta", FCIDM_SHVIEW_DELETE
+        MENUITEM "Nimeta &ümber", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Atribuudid", IDM_PROPERTIES
+        MENUITEM "&Atribuudid", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/eu-ES.rc b/dll/win32/shell32/lang/eu-ES.rc
index ae68e1d936f..021c9973379 100644
--- a/dll/win32/shell32/lang/eu-ES.rc
+++ b/dll/win32/shell32/lang/eu-ES.rc
@@ -71,15 +71,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "E&baki", IDM_CUT
-        MENUITEM "&Kopiatu", IDM_COPY
-        MENUITEM "&Itsatsi", IDM_INSERT
+        MENUITEM "E&baki", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopiatu", FCIDM_SHVIEW_COPY
+        MENUITEM "&Itsatsi", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Sortu &lasterbidea", IDM_CREATELINK
-        MENUITEM "E&zabatu", IDM_DELETE
-        MENUITEM "Ize&na aldatu", IDM_RENAME
+        MENUITEM "Sortu &lasterbidea", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "E&zabatu", FCIDM_SHVIEW_DELETE
+        MENUITEM "Ize&na aldatu", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Propietateak", IDM_PROPERTIES
+        MENUITEM "&Propietateak", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc
index d2774cb54a0..c80e149ffc0 100644
--- a/dll/win32/shell32/lang/fi-FI.rc
+++ b/dll/win32/shell32/lang/fi-FI.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Leikkaa", IDM_CUT
-        MENUITEM "&Kopioi", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "&Leikkaa", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopioi", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Lu&o Linkki", IDM_CREATELINK
-        MENUITEM "&Poista", IDM_DELETE
-        MENUITEM "&Nimeä Uudelleen", IDM_RENAME
+        MENUITEM "Lu&o Linkki", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Poista", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Nimeä Uudelleen", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Ominaisuudet", IDM_PROPERTIES
+        MENUITEM "&Ominaisuudet", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc
index beffc7cd40f..779b51b3793 100644
--- a/dll/win32/shell32/lang/fr-FR.rc
+++ b/dll/win32/shell32/lang/fr-FR.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ouper", IDM_CUT
-        MENUITEM "&Copier", IDM_COPY
-        MENUITEM "Coller", IDM_INSERT
+        MENUITEM "C&ouper", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copier", FCIDM_SHVIEW_COPY
+        MENUITEM "Coller", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Créer un &lien", IDM_CREATELINK
-        MENUITEM "&Supprimer", IDM_DELETE
-        MENUITEM "&Renommer", IDM_RENAME
+        MENUITEM "Créer un &lien", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Supprimer", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Renommer", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Propriétés", IDM_PROPERTIES
+        MENUITEM "&Propriétés", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc
index c7dbb920ea5..3d4337c5dc7 100644
--- a/dll/win32/shell32/lang/he-IL.rc
+++ b/dll/win32/shell32/lang/he-IL.rc
@@ -66,15 +66,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "גזור", IDM_CUT
-        MENUITEM "העתק", IDM_COPY
-        MENUITEM "הדבק", IDM_INSERT
+        MENUITEM "גזור", FCIDM_SHVIEW_CUT
+        MENUITEM "העתק", FCIDM_SHVIEW_COPY
+        MENUITEM "הדבק", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "צור קישור", IDM_CREATELINK
-        MENUITEM "מחק", IDM_DELETE
-        MENUITEM "שנה שם", IDM_RENAME
+        MENUITEM "צור קישור", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "מחק", FCIDM_SHVIEW_DELETE
+        MENUITEM "שנה שם", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "מאפיינים", IDM_PROPERTIES
+        MENUITEM "מאפיינים", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc
index 3e467d0990b..e5d0f7a1549 100644
--- a/dll/win32/shell32/lang/hi-IN.rc
+++ b/dll/win32/shell32/lang/hi-IN.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&कट", IDM_CUT
-        MENUITEM "&कापी", IDM_COPY
-        MENUITEM "पेस्ट", IDM_INSERT
+        MENUITEM "&कट", FCIDM_SHVIEW_CUT
+        MENUITEM "&कापी", FCIDM_SHVIEW_COPY
+        MENUITEM "पेस्ट", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "&लिंक बनाएं", IDM_CREATELINK
-        MENUITEM "&हटाएं", IDM_DELETE
-        MENUITEM "&पुन:नामकरण", IDM_RENAME
+        MENUITEM "&लिंक बनाएं", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&हटाएं", FCIDM_SHVIEW_DELETE
+        MENUITEM "&पुन:नामकरण", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&गुण", IDM_PROPERTIES
+        MENUITEM "&गुण", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc
index 3d5b3a3d051..8b3d9ba2dae 100644
--- a/dll/win32/shell32/lang/hu-HU.rc
+++ b/dll/win32/shell32/lang/hu-HU.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Kivágás", IDM_CUT
-        MENUITEM "Másolás", IDM_COPY
-        MENUITEM "Beillesztés", IDM_INSERT
+        MENUITEM "Kivágás", FCIDM_SHVIEW_CUT
+        MENUITEM "Másolás", FCIDM_SHVIEW_COPY
+        MENUITEM "Beillesztés", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Parancsikon létrehozása", IDM_CREATELINK
-        MENUITEM "Törlés", IDM_DELETE
-        MENUITEM "Átnevezés", IDM_RENAME
+        MENUITEM "Parancsikon létrehozása", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "Törlés", FCIDM_SHVIEW_DELETE
+        MENUITEM "Átnevezés", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Tulajdonságok", IDM_PROPERTIES
+        MENUITEM "Tulajdonságok", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc
index f39db662892..a2f07a719e4 100644
--- a/dll/win32/shell32/lang/id-ID.rc
+++ b/dll/win32/shell32/lang/id-ID.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Gun&ting", IDM_CUT
-        MENUITEM "&Salin", IDM_COPY
-        MENUITEM "Te&mpel", IDM_INSERT
+        MENUITEM "Gun&ting", FCIDM_SHVIEW_CUT
+        MENUITEM "&Salin", FCIDM_SHVIEW_COPY
+        MENUITEM "Te&mpel", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Buat &pintasan", IDM_CREATELINK
-        MENUITEM "&Hapus", IDM_DELETE
-        MENUITEM "&Ubah Nama", IDM_RENAME
+        MENUITEM "Buat &pintasan", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Hapus", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Ubah Nama", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properti", IDM_PROPERTIES
+        MENUITEM "&Properti", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc
index b84dd2aa607..60636d41951 100644
--- a/dll/win32/shell32/lang/it-IT.rc
+++ b/dll/win32/shell32/lang/it-IT.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Taglia", IDM_CUT
-        MENUITEM "&Copia", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "&Taglia", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copia", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "&Crea Collegamento", IDM_CREATELINK
-        MENUITEM "&Cancella", IDM_DELETE
-        MENUITEM "&Rinomina", IDM_RENAME
+        MENUITEM "&Crea Collegamento", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Cancella", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rinomina", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Proprietà", IDM_PROPERTIES
+        MENUITEM "&Proprietà", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc
index 3bf8ede3010..cbf70162baa 100644
--- a/dll/win32/shell32/lang/ja-JP.rc
+++ b/dll/win32/shell32/lang/ja-JP.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "切り取り(&U)", IDM_CUT
-        MENUITEM "コピー(&C)", IDM_COPY
-        MENUITEM "貼り付け(&P)", IDM_INSERT
+        MENUITEM "切り取り(&U)", FCIDM_SHVIEW_CUT
+        MENUITEM "コピー(&C)", FCIDM_SHVIEW_COPY
+        MENUITEM "貼り付け(&P)", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "ショートカットの作成(&L)", IDM_CREATELINK
-        MENUITEM "削除(&D)", IDM_DELETE
-        MENUITEM "名前の変更(&R)", IDM_RENAME
+        MENUITEM "ショートカットの作成(&L)", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "削除(&D)", FCIDM_SHVIEW_DELETE
+        MENUITEM "名前の変更(&R)", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "プロパティ(&P)", IDM_PROPERTIES
+        MENUITEM "プロパティ(&P)", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc
index c2ac56c7fdc..298c6c53de8 100644
--- a/dll/win32/shell32/lang/ko-KR.rc
+++ b/dll/win32/shell32/lang/ko-KR.rc
@@ -71,15 +71,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "잘라내기(&U)", IDM_CUT
-        MENUITEM "복사(&C)", IDM_COPY
-        MENUITEM "붙여넣기", IDM_INSERT
+        MENUITEM "잘라내기(&U)", FCIDM_SHVIEW_CUT
+        MENUITEM "복사(&C)", FCIDM_SHVIEW_COPY
+        MENUITEM "붙여넣기", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "바로 가기 만들기(&L)", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "바로 가기 만들기(&L)", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc
index d9317f6817d..99dfe7b1b5f 100644
--- a/dll/win32/shell32/lang/nl-NL.rc
+++ b/dll/win32/shell32/lang/nl-NL.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "C&ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc
index 2b389f122bc..79828b0693a 100644
--- a/dll/win32/shell32/lang/no-NO.rc
+++ b/dll/win32/shell32/lang/no-NO.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Klipp &ut", IDM_CUT
-        MENUITEM "&Kopier", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Klipp &ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopier", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "&Opprett snarvei", IDM_CREATELINK
-        MENUITEM "&Slett", IDM_DELETE
-        MENUITEM "&Gi nytt navn", IDM_RENAME
+        MENUITEM "&Opprett snarvei", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Slett", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Gi nytt navn", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Egenska&per", IDM_PROPERTIES
+        MENUITEM "Egenska&per", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc
index 3163b1d614e..2139ab39557 100644
--- a/dll/win32/shell32/lang/pl-PL.rc
+++ b/dll/win32/shell32/lang/pl-PL.rc
@@ -70,15 +70,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Wytnij", IDM_CUT
-        MENUITEM "&Kopiuj", IDM_COPY
-        MENUITEM "Wklej", IDM_INSERT
+        MENUITEM "&Wytnij", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopiuj", FCIDM_SHVIEW_COPY
+        MENUITEM "Wklej", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Utwórz &Skrót", IDM_CREATELINK
-        MENUITEM "&Usuń", IDM_DELETE
-        MENUITEM "&Zmień nazwę", IDM_RENAME
+        MENUITEM "Utwórz &Skrót", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Usuń", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Zmień nazwę", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Wł&aściwości", IDM_PROPERTIES
+        MENUITEM "Wł&aściwości", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc
index e5f662489df..6014534422a 100644
--- a/dll/win32/shell32/lang/pt-BR.rc
+++ b/dll/win32/shell32/lang/pt-BR.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ortar", IDM_CUT
-        MENUITEM "&Copiar", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "C&ortar", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copiar", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Criar a&talho", IDM_CREATELINK
-        MENUITEM "E&xcluir", IDM_DELETE
-        MENUITEM "&Renomear", IDM_RENAME
+        MENUITEM "Criar a&talho", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "E&xcluir", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Renomear", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Propriedades", IDM_PROPERTIES
+        MENUITEM "&Propriedades", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc
index 6da36e57473..e3afea9602f 100644
--- a/dll/win32/shell32/lang/pt-PT.rc
+++ b/dll/win32/shell32/lang/pt-PT.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ortar", IDM_CUT
-        MENUITEM "&Copiar", IDM_COPY
-        MENUITEM "Co&lar", IDM_INSERT
+        MENUITEM "C&ortar", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copiar", FCIDM_SHVIEW_COPY
+        MENUITEM "Co&lar", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Criar &atalho", IDM_CREATELINK
-        MENUITEM "&Eliminar", IDM_DELETE
-        MENUITEM "&Mudar o nome", IDM_RENAME
+        MENUITEM "Criar &atalho", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Eliminar", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Mudar o nome", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Propriedades", IDM_PROPERTIES
+        MENUITEM "&Propriedades", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc
index 5dd1b2527de..7c901196513 100644
--- a/dll/win32/shell32/lang/ro-RO.rc
+++ b/dll/win32/shell32/lang/ro-RO.rc
@@ -66,15 +66,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Decupează", IDM_CUT
-        MENUITEM "&Copiază", IDM_COPY
-        MENUITEM "&Lipește", IDM_INSERT
+        MENUITEM "&Decupează", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copiază", FCIDM_SHVIEW_COPY
+        MENUITEM "&Lipește", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Crează sc&urtătură", IDM_CREATELINK
-        MENUITEM "Șt&erge", IDM_DELETE
-        MENUITEM "&Redenumește", IDM_RENAME
+        MENUITEM "Crează sc&urtătură", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "Șt&erge", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Redenumește", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Proprietăți", IDM_PROPERTIES
+        MENUITEM "&Proprietăți", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc
index 7315b78d1ef..78b01150e5b 100644
--- a/dll/win32/shell32/lang/ru-RU.rc
+++ b/dll/win32/shell32/lang/ru-RU.rc
@@ -71,15 +71,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Вырезать", IDM_CUT
-        MENUITEM "&Копировать", IDM_COPY
-        MENUITEM "Вст&авить", IDM_INSERT
+        MENUITEM "&Вырезать", FCIDM_SHVIEW_CUT
+        MENUITEM "&Копировать", FCIDM_SHVIEW_COPY
+        MENUITEM "Вст&авить", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Создать &ярлык", IDM_CREATELINK
-        MENUITEM "&Удалить", IDM_DELETE
-        MENUITEM "Переи&меновать", IDM_RENAME
+        MENUITEM "Создать &ярлык", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Удалить", FCIDM_SHVIEW_DELETE
+        MENUITEM "Переи&меновать", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Сво&йства", IDM_PROPERTIES
+        MENUITEM "Сво&йства", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc
index dc275f972bc..facb518d0d8 100644
--- a/dll/win32/shell32/lang/sk-SK.rc
+++ b/dll/win32/shell32/lang/sk-SK.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Vystrihnúť", IDM_CUT
-        MENUITEM "&Kopírovať", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "&Vystrihnúť", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopírovať", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Vytvoriť o&dkaz", IDM_CREATELINK
-        MENUITEM "&Odstrániť", IDM_DELETE
-        MENUITEM "Pre&menovať", IDM_RENAME
+        MENUITEM "Vytvoriť o&dkaz", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Odstrániť", FCIDM_SHVIEW_DELETE
+        MENUITEM "Pre&menovať", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Vl&astnosti", IDM_PROPERTIES
+        MENUITEM "Vl&astnosti", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc
index 3cd81c7ecec..6b04f155ac2 100644
--- a/dll/win32/shell32/lang/sl-SI.rc
+++ b/dll/win32/shell32/lang/sl-SI.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "C&ut", IDM_CUT
-        MENUITEM "&Copy", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "C&ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Copy", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Create &Link", IDM_CREATELINK
-        MENUITEM "&Delete", IDM_DELETE
-        MENUITEM "&Rename", IDM_RENAME
+        MENUITEM "Create &Link", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Delete", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Rename", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Properties", IDM_PROPERTIES
+        MENUITEM "&Properties", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc
index e5ec851050a..f779d9b0c13 100644
--- a/dll/win32/shell32/lang/sq-AL.rc
+++ b/dll/win32/shell32/lang/sq-AL.rc
@@ -68,15 +68,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "Prej", IDM_CUT
-        MENUITEM "&Kopjo", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "Prej", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopjo", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Krijo &Lidhje", IDM_CREATELINK
-        MENUITEM "&Fshi", IDM_DELETE
-        MENUITEM "&Riemërto", IDM_RENAME
+        MENUITEM "Krijo &Lidhje", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Fshi", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Riemërto", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Cilësime", IDM_PROPERTIES
+        MENUITEM "&Cilësime", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc
index 223fb02b50f..5937dc529c3 100644
--- a/dll/win32/shell32/lang/sv-SE.rc
+++ b/dll/win32/shell32/lang/sv-SE.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "K&lipp ut", IDM_CUT
-        MENUITEM "&Kopiera", IDM_COPY
-        MENUITEM "Paste", IDM_INSERT
+        MENUITEM "K&lipp ut", FCIDM_SHVIEW_CUT
+        MENUITEM "&Kopiera", FCIDM_SHVIEW_COPY
+        MENUITEM "Paste", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Skapa &genväg", IDM_CREATELINK
-        MENUITEM "&Ta bort", IDM_DELETE
-        MENUITEM "&Byt namn", IDM_RENAME
+        MENUITEM "Skapa &genväg", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "&Ta bort", FCIDM_SHVIEW_DELETE
+        MENUITEM "&Byt namn", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "&Egenskaper", IDM_PROPERTIES
+        MENUITEM "&Egenskaper", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc
index 0abbb8380c6..5ba20e0ea79 100644
--- a/dll/win32/shell32/lang/tr-TR.rc
+++ b/dll/win32/shell32/lang/tr-TR.rc
@@ -66,15 +66,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Kes", IDM_CUT
-        MENUITEM "K&opyala", IDM_COPY
-        MENUITEM "&Yapıştır", IDM_INSERT
+        MENUITEM "&Kes", FCIDM_SHVIEW_CUT
+        MENUITEM "K&opyala", FCIDM_SHVIEW_COPY
+        MENUITEM "&Yapıştır", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Kı&sayol Oluştur", IDM_CREATELINK
-        MENUITEM "Si&l", IDM_DELETE
-        MENUITEM "Y&eniden Adlandır", IDM_RENAME
+        MENUITEM "Kı&sayol Oluştur", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "Si&l", FCIDM_SHVIEW_DELETE
+        MENUITEM "Y&eniden Adlandır", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "Ö&zellikler", IDM_PROPERTIES
+        MENUITEM "Ö&zellikler", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc
index 8fa830b900c..2aa58be3a55 100644
--- a/dll/win32/shell32/lang/uk-UA.rc
+++ b/dll/win32/shell32/lang/uk-UA.rc
@@ -64,15 +64,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "&Вирізати", IDM_CUT
-        MENUITEM "&Копіювати", IDM_COPY
-        MENUITEM "Вст&авити", IDM_INSERT
+        MENUITEM "&Вирізати", FCIDM_SHVIEW_CUT
+        MENUITEM "&Копіювати", FCIDM_SHVIEW_COPY
+        MENUITEM "Вст&авити", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "Створити &ярлик", IDM_CREATELINK
-        MENUITEM "В&идалити", IDM_DELETE
-        MENUITEM "Перей&менувати", IDM_RENAME
+        MENUITEM "Створити &ярлик", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "В&идалити", FCIDM_SHVIEW_DELETE
+        MENUITEM "Перей&менувати", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "В&ластивості", IDM_PROPERTIES
+        MENUITEM "В&ластивості", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc
index cef2a4582d9..2b3909e63bb 100644
--- a/dll/win32/shell32/lang/zh-CN.rc
+++ b/dll/win32/shell32/lang/zh-CN.rc
@@ -74,15 +74,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "剪切(&U)", IDM_CUT
-        MENUITEM "复制(&C)", IDM_COPY
-        MENUITEM "粘贴", IDM_INSERT
+        MENUITEM "剪切(&U)", FCIDM_SHVIEW_CUT
+        MENUITEM "复制(&C)", FCIDM_SHVIEW_COPY
+        MENUITEM "粘贴", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "创建快捷方式(&L)", IDM_CREATELINK
-        MENUITEM "删除(&D)", IDM_DELETE
-        MENUITEM "重命名(&R)", IDM_RENAME
+        MENUITEM "创建快捷方式(&L)", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "删除(&D)", FCIDM_SHVIEW_DELETE
+        MENUITEM "重命名(&R)", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "属性(&P)", IDM_PROPERTIES
+        MENUITEM "属性(&P)", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/zh-HK.rc b/dll/win32/shell32/lang/zh-HK.rc
index 28f0577cb10..fa2be7660a8 100644
--- a/dll/win32/shell32/lang/zh-HK.rc
+++ b/dll/win32/shell32/lang/zh-HK.rc
@@ -72,15 +72,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "剪下(&U)", IDM_CUT
-        MENUITEM "複製(&C)", IDM_COPY
-        MENUITEM "貼上", IDM_INSERT
+        MENUITEM "剪下(&U)", FCIDM_SHVIEW_CUT
+        MENUITEM "複製(&C)", FCIDM_SHVIEW_COPY
+        MENUITEM "貼上", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "建立捷徑(&L)", IDM_CREATELINK
-        MENUITEM "刪除(&D)", IDM_DELETE
-        MENUITEM "重新命名(&R)", IDM_RENAME
+        MENUITEM "建立捷徑(&L)", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "刪除(&D)", FCIDM_SHVIEW_DELETE
+        MENUITEM "重新命名(&R)", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "內容(&P)", IDM_PROPERTIES
+        MENUITEM "內容(&P)", FCIDM_SHVIEW_PROPERTIES
     END
 END
 
diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc
index 371f99222a2..e96a9c6adfb 100644
--- a/dll/win32/shell32/lang/zh-TW.rc
+++ b/dll/win32/shell32/lang/zh-TW.rc
@@ -73,15 +73,15 @@ BEGIN
     POPUP ""
     BEGIN
         MENUITEM SEPARATOR
-        MENUITEM "剪下(&U)", IDM_CUT
-        MENUITEM "複製(&C)", IDM_COPY
-        MENUITEM "貼上", IDM_INSERT
+        MENUITEM "剪下(&U)", FCIDM_SHVIEW_CUT
+        MENUITEM "複製(&C)", FCIDM_SHVIEW_COPY
+        MENUITEM "貼上", FCIDM_SHVIEW_INSERT
         MENUITEM SEPARATOR
-        MENUITEM "建立捷徑(&L)", IDM_CREATELINK
-        MENUITEM "刪除(&D)", IDM_DELETE
-        MENUITEM "重新命名(&R)", IDM_RENAME
+        MENUITEM "建立捷徑(&L)", FCIDM_SHVIEW_CREATELINK
+        MENUITEM "刪除(&D)", FCIDM_SHVIEW_DELETE
+        MENUITEM "重新命名(&R)", FCIDM_SHVIEW_RENAME
         MENUITEM SEPARATOR
-        MENUITEM "內容(&P)", IDM_PROPERTIES
+        MENUITEM "內容(&P)", FCIDM_SHVIEW_PROPERTIES
     END
 END