[BROWSEUI][SHELL32] -Move bitmap resources used by browseui from shell32 to browseui. Browseui alongside filebrowser.exe can already be used in windows so it makes sense to let it have toolbar icons even in latest windows versions. (It works from xp to win10).

svn path=/trunk/; revision=75677

reactos/dll/win32/browseui/addressband.cpp

@@ -529,7 +529,7 @@ void CAddressBand::CreateGoButton()
     const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } };
     HINSTANCE             shellInstance;
 
-    shellInstance = GetModuleHandle(_T("shell32.dll"));
+    shellInstance = _AtlBaseModule.GetResourceInstance();
     m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL),
                                            20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION);
     m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT),

reactos/dll/win32/browseui/brandband.cpp

@@ -85,7 +85,6 @@ void CBrandBand::SelectImage()
     int                                     clientWidth;
     int                                     clientHeight;
     int                                     clientSize;
-    HINSTANCE                               shell32Instance;
     BITMAP                                  bitmapInfo;
     int                                     resourceID;
 
@@ -102,8 +101,7 @@ void CBrandBand::SelectImage()
         resourceID += 2;
     else if (clientSize >= gMediumImageSize)
         resourceID += 1;
-    shell32Instance = GetModuleHandle(L"shell32.dll");
-    fImageBitmap = LoadBitmap(shell32Instance, MAKEINTRESOURCE(resourceID));
+    fImageBitmap = LoadBitmap(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(resourceID));
     GetObjectW(fImageBitmap, sizeof(bitmapInfo), &bitmapInfo);
     fBitmapSize = bitmapInfo.bmWidth;
     fMaxFrameCount = bitmapInfo.bmHeight / fBitmapSize;

reactos/dll/win32/browseui/browseui.rc

@@ -110,3 +110,15 @@ IDR_ACLISTISF REGISTRY "res/shellautocomplete.rgs"
 
 /* Include band button bitmaps */
 IDB_BANDBUTTONS BITMAP "res/barbtn.bmp"
+IDB_SHELL_EXPLORER_LG        BITMAP "res/214.bmp"
+IDB_SHELL_EXPLORER_LG_HOT    BITMAP "res/215.bmp"
+IDB_SHELL_EXPLORER_SM        BITMAP "res/216.bmp"
+IDB_SHELL_EXPLORER_SM_HOT    BITMAP "res/217.bmp"
+IDB_SHELL_GO                 BITMAP "res/230.bmp"
+IDB_SHELL_GO_HOT             BITMAP "res/231.bmp"
+IDB_SHELL_BRANDBAND_SM_HI    BITMAP "res/240.bmp"
+/*IDB_SHELL_BRANDBAND_MD_HI    BITMAP "res/241.bmp"
+IDB_SHELL_BRANDBAND_LG_HI    BITMAP "res/242.bmp"
+IDB_SHELL_BRANDBAND_SM_LO    BITMAP "res/245.bmp"
+IDB_SHELL_BRANDBAND_MD_LO    BITMAP "res/246.bmp"
+IDB_SHELL_BRANDBAND_LG_LO    BITMAP "res/247.bmp"*/

reactos/dll/win32/browseui/resource.h

@@ -129,3 +129,15 @@
 #define IDC_ICONOPTIONS 4097
 
 #define IDB_BANDBUTTONS 545
+#define IDB_SHELL_EXPLORER_LG       214
+#define IDB_SHELL_EXPLORER_LG_HOT   215
+#define IDB_SHELL_EXPLORER_SM       216
+#define IDB_SHELL_EXPLORER_SM_HOT   217
+#define IDB_SHELL_GO                230
+#define IDB_SHELL_GO_HOT            231
+#define IDB_SHELL_BRANDBAND_SM_HI   240
+/*#define IDB_SHELL_BRANDBAND_MD_HI   241
+#define IDB_SHELL_BRANDBAND_LG_HI   242
+#define IDB_SHELL_BRANDBAND_SM_LO   245
+#define IDB_SHELL_BRANDBAND_MD_LO   246
+#define IDB_SHELL_BRANDBAND_LG_LO   247*/

reactos/dll/win32/browseui/toolsband.cpp

@@ -295,12 +295,13 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite){
     SendMessage(TB_SETMAXTEXTROWS, 1, 0);
     SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS);
 
-    HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll"));
-    m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214),
-                                           0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
+    m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), 
+                                        MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG),
+                                        0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
 
-    m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215),
-                                           0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
+    m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), 
+                                     MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT),
+                                     0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
 
     SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal);
     SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot);

reactos/dll/win32/shell32/bitmap_res.rc

@@ -4,19 +4,7 @@ IDB_SHELL_IEXPLORE_LG        BITMAP "res/bitmaps/204.bmp"
 IDB_SHELL_IEXPLORE_LG_HOT    BITMAP "res/bitmaps/205.bmp"
 IDB_SHELL_IEXPLORE_SM        BITMAP "res/bitmaps/206.bmp"
 IDB_SHELL_IEXPLORE_SM_HOT    BITMAP "res/bitmaps/207.bmp"
-IDB_SHELL_EXPLORER_LG        BITMAP "res/bitmaps/214.bmp"
-IDB_SHELL_EXPLORER_LG_HOT    BITMAP "res/bitmaps/215.bmp"
-IDB_SHELL_EXPLORER_SM        BITMAP "res/bitmaps/216.bmp"
-IDB_SHELL_EXPLORER_SM_HOT    BITMAP "res/bitmaps/217.bmp"
 IDB_SHELL_EDIT_LG            BITMAP "res/bitmaps/225.bmp"
 IDB_SHELL_EDIT_LG_HOT        BITMAP "res/bitmaps/226.bmp"
 IDB_SHELL_EDIT_SM            BITMAP "res/bitmaps/227.bmp"
 IDB_SHELL_EDIT_SM_HOT        BITMAP "res/bitmaps/228.bmp"
-IDB_SHELL_GO                 BITMAP "res/bitmaps/230.bmp"
-IDB_SHELL_GO_HOT             BITMAP "res/bitmaps/231.bmp"
-IDB_SHELL_BRANDBAND_SM_HI    BITMAP "res/bitmaps/240.bmp"
-/*IDB_SHELL_BRANDBAND_MD_HI    BITMAP "res/bitmaps/241.bmp"
-IDB_SHELL_BRANDBAND_LG_HI    BITMAP "res/bitmaps/242.bmp"
-IDB_SHELL_BRANDBAND_SM_LO    BITMAP "res/bitmaps/245.bmp"
-IDB_SHELL_BRANDBAND_MD_LO    BITMAP "res/bitmaps/246.bmp"
-IDB_SHELL_BRANDBAND_LG_LO    BITMAP "res/bitmaps/247.bmp"*/

reactos/dll/win32/shell32/shresdef.h

@@ -31,22 +31,10 @@
 #define IDB_SHELL_IEXPLORE_LG_HOT   205
 #define IDB_SHELL_IEXPLORE_SM       206
 #define IDB_SHELL_IEXPLORE_SM_HOT   207
-#define IDB_SHELL_EXPLORER_LG       214
-#define IDB_SHELL_EXPLORER_LG_HOT   215
-#define IDB_SHELL_EXPLORER_SM       216
-#define IDB_SHELL_EXPLORER_SM_HOT   217
 #define IDB_SHELL_EDIT_LG           225
 #define IDB_SHELL_EDIT_LG_HOT       226
 #define IDB_SHELL_EDIT_SM           227
 #define IDB_SHELL_EDIT_SM_HOT       228
-#define IDB_SHELL_GO                230
-#define IDB_SHELL_GO_HOT            231
-#define IDB_SHELL_BRANDBAND_SM_HI   240
-/*#define IDB_SHELL_BRANDBAND_MD_HI   241
-#define IDB_SHELL_BRANDBAND_LG_HI   242
-#define IDB_SHELL_BRANDBAND_SM_LO   245
-#define IDB_SHELL_BRANDBAND_MD_LO   246
-#define IDB_SHELL_BRANDBAND_LG_LO   247*/
 
 /* Strings */