[dquintana] 62328: [RSHELL] * CStartMenu: Update the icon resource IDs to the IDs with the smaller images. This causes the images not to show. Need help figuring out why. * Misc changes. CORE-7586

Author: dquintana
Date: Tue Feb 25 10:44:28 2014
New Revision: 62328

URL: http://svn.reactos.org/svn/reactos?rev=62328&view=rev
Log:
[RSHELL]
* CStartMenu: Update the icon resource IDs to the IDs with the smaller images. This causes
the images not to show. Need help figuring out why.
* Misc changes.
CORE-7586

Modified:
    branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
    branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
    branches/shell-experiments/base/shell/rshell/CMenuToolbars.h
    branches/shell-experiments/base/shell/rshell/CStartMenu.cpp
    branches/shell-experiments/base/shell/rshell/wraplog.cpp

Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp	[iso-8859-1] Tue Feb 25
10:44:28 2014
@@ -875,10 +875,8 @@
     {
         if (m_hotBar && m_hotItem >= 0)
         {
-            // TODO: popup the current child if it has subitems, otherwise spread up.
             if (m_hotBar->HasSubMenu(m_hotItem)==S_OK)
             {
-                LRESULT result;
                 m_hotBar->PopupItem(m_hotItem);
                 return S_FALSE;
             }

Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1]
(original)
+++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp	[iso-8859-1] Tue Feb 25
10:44:28 2014
@@ -64,6 +64,13 @@
 {
     ::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE);
 
+    UpdateImageLists();
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::UpdateImageLists()
+{
     int shiml;
     if (m_menuBand->UseBigIcons())
     {
@@ -85,7 +92,6 @@
     {
         SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, 0);
     }
-
     return S_OK;
 }
 
@@ -163,30 +169,11 @@
     //    SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0);
     //}
     //else
-    int shiml;
-    if (m_menuBand->UseBigIcons())
-    {
-        shiml = SHIL_LARGE;
-        SendMessageW(hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(0, 0));
-    }
-    else
-    {
-        shiml = SHIL_SMALL;
-    }
-
-    IImageList * piml;
-    HRESULT hr = SHGetImageList(shiml, IID_PPV_ARG(IImageList, &piml));
-    if (SUCCEEDED(hr))
-    {
-        SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0,
reinterpret_cast<LPARAM>(piml));
-    }
-    else
-    {
-        SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, 0);
-    }
 
     SetWindowLongPtr(hwndToolbar, GWLP_USERDATA,
reinterpret_cast<LONG_PTR>(this));
     m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC,
reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc));
+
+    UpdateImageLists();
 
     return S_OK;
 }

Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h	[iso-8859-1] Tue Feb 25
10:44:28 2014
@@ -70,6 +70,8 @@
 
 protected:
     LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+    HRESULT UpdateImageLists();
 };
 
 class CMenuStaticToolbar :

Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp	[iso-8859-1] Tue Feb 25
10:44:28 2014
@@ -90,23 +90,26 @@
 
         switch (psmd->uId)
         {
-        case IDM_PROGRAMS:  iconIndex = -20; break;
-        case IDM_FAVORITES: iconIndex = -173; break;
-        case IDM_DOCUMENTS: iconIndex = -21; break;
-        case IDM_SETTINGS: iconIndex = -22; break;
+            // Smaller "24x24" icons used for the start menu
+            // The bitmaps are still 32x32, but the image is centered
+        case IDM_FAVORITES: iconIndex = -209; break;
+        case IDM_SEARCH: iconIndex = -210; break;
+        case IDM_HELPANDSUPPORT: iconIndex = -211; break;
+        case IDM_LOGOFF: iconIndex = -212; break;
+        case IDM_PROGRAMS:  iconIndex = -213; break;
+        case IDM_DOCUMENTS: iconIndex = -214; break;
+        case IDM_RUN: iconIndex = -215; break;
+        case IDM_SHUTDOWN: iconIndex = -216; break;
+        case IDM_SETTINGS: iconIndex = -217; break;
+
         case IDM_CONTROLPANEL: iconIndex = -22; break;
-        //case IDM_SECURITY: iconIndex = -21; break;
         case IDM_NETWORKCONNECTIONS: iconIndex = -257; break;
         case IDM_PRINTERSANDFAXES: iconIndex = -138; break;
         case IDM_TASKBARANDSTARTMENU: iconIndex = -40; break;
-        case IDM_SEARCH: iconIndex = -23; break;
-        case IDM_HELPANDSUPPORT: iconIndex = -24; break;
-        case IDM_RUN: iconIndex = -25; break;
+        //case IDM_SECURITY: iconIndex = -21; break;
         //case IDM_SYNCHRONIZE: iconIndex = -21; break;
-        case IDM_LOGOFF: iconIndex = -45; break;
         //case IDM_DISCONNECT: iconIndex = -21; break;
         //case IDM_UNDOCKCOMPUTER: iconIndex = -21; break;
-        case IDM_SHUTDOWN: iconIndex = -28; break;
         default:
             return S_FALSE;
         }

Modified: branches/shell-experiments/base/shell/rshell/wraplog.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs…
==============================================================================
--- branches/shell-experiments/base/shell/rshell/wraplog.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/base/shell/rshell/wraplog.cpp	[iso-8859-1] Tue Feb 25
10:44:28 2014
@@ -13,7 +13,7 @@
 {
     if (openCount == 0)
     {
-        log = fopen("G:\\RShellWrap.log", "w");
+        log = fopen("RShellWrap.log", "w");
         nTemps = 0;
         callLevel = 0;
     }