[dquintana] 63811: [SHELL32] * Improve the view menu handler a bit. Now the view menu properly marks the current view as expected.

Author: dquintana
Date: Tue Aug  5 01:15:41 2014
New Revision: 63811

URL: http://svn.reactos.org/svn/reactos?rev=63811&view=rev
Log:
[SHELL32]
* Improve the view menu handler a bit. Now the view menu properly marks the current view as expected.

Modified:
    branches/shell-experiments/dll/win32/shell32/shlview.cpp

Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/shel...
==============================================================================
--- branches/shell-experiments/dll/win32/shell32/shlview.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/shell32/shlview.cpp	[iso-8859-1] Tue Aug  5 01:15:41 2014
@@ -1095,15 +1095,13 @@
     if (!hSubMenu)
         return;

-    __debugbreak();
-
-    DWORD item;
-    item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_BIGICON,    FALSE);
-    item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_SMALLICON,  FALSE);
-    item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_LISTVIEW,   FALSE);
-    item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_REPORTVIEW, FALSE);
-
-    if (item == -1)
+    // FIXME: I believe windows has all of the items initially in the menu,
+    // and actively calls DeleteMenu on the items that should not be disaplyed.
+
+    MENUITEMINFOW mii = { 0 };
+    mii.cbSize = sizeof(mii);
+    mii.fMask = MIIM_ID | MIIM_STATE;
+    if (::GetMenuItemInfoW(hSubMenu, FCIDM_SHVIEW_BIGICON, FALSE, &mii) == 0)
     {
         HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001");

@@ -1112,9 +1110,9 @@
         INT count = ::GetMenuItemCount(menubase);
         for (int i = 0; i < count; i++)
         {
-            MENUITEMINFOW mii = { 0 };
             WCHAR label[128];

+            ZeroMemory(&mii, sizeof(mii));
             mii.cbSize = sizeof(mii);
             mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE;
             mii.dwTypeData = label;
@@ -1131,18 +1129,12 @@
         ::DestroyMenu(menubase);
     }

-    DbgPrint("View mode is %d\n", m_FolderSettings.ViewMode);
-
     if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST)
     {
-        UINT iItem = FCIDM_SHVIEW_BIGICON + m_FolderSettings.ViewMode - FVM_FIRST;
-        DbgPrint("Checking item %d ...\n", iItem);
-        item = SHCheckMenuItem(hSubMenu, iItem, TRUE);
-        DbgPrint("SHCheckMenuItem returned %d\n", item);
-        if (item == -1)
-        {
-            DbgPrint("GetLastError returned %d\n", GetLastError());
-        }
+        UINT iItemFirst = FCIDM_SHVIEW_BIGICON;
+        UINT iItemLast = iItemFirst + FVM_LAST - FVM_FIRST;
+        UINT iItem = iItemFirst + m_FolderSettings.ViewMode - FVM_FIRST;
+        CheckMenuRadioItem(hSubMenu, iItemFirst, iItemLast, iItem, MF_BYCOMMAND);
     }
 }