[gadamopoulos] 75677: [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 le...
Author: gadamopoulos Date: Sat Aug 26 14:38:32 2017 New Revision: 75677
URL: http://svn.reactos.org/svn/reactos?rev=75677&view=rev Log: [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).
Added: trunk/reactos/dll/win32/browseui/res/214.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp trunk/reactos/dll/win32/browseui/res/215.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp trunk/reactos/dll/win32/browseui/res/216.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp trunk/reactos/dll/win32/browseui/res/217.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp trunk/reactos/dll/win32/browseui/res/230.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp trunk/reactos/dll/win32/browseui/res/231.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp trunk/reactos/dll/win32/browseui/res/240.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp trunk/reactos/dll/win32/browseui/res/241.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp trunk/reactos/dll/win32/browseui/res/242.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp trunk/reactos/dll/win32/browseui/res/245.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp trunk/reactos/dll/win32/browseui/res/246.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp trunk/reactos/dll/win32/browseui/res/247.bmp - copied unchanged from r75676, trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/shresdef.h
Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/addressb... ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -529,7 +529,7 @@ 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),
Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandban... ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -85,7 +85,6 @@ int clientWidth; int clientHeight; int clientSize; - HINSTANCE shell32Instance; BITMAP bitmapInfo; int resourceID;
@@ -102,8 +101,7 @@ 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;
Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseui... ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -110,3 +110,15 @@
/* 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"*/
Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resource... ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -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*/
Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsban... ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -295,12 +295,13 @@ 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_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), - 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(_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);
Modified: trunk/reactos/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/bitmap_re... ============================================================================== --- trunk/reactos/dll/win32/shell32/bitmap_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/bitmap_res.rc [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -4,19 +4,7 @@ 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"*/
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/214.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/215.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/216.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/217.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/230.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/231.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/240.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/241.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/242.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/245.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/246.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Removed: trunk/reactos/dll/win32/shell32/res/bitmaps/247.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/bitma... ============================================================================== Binary file - no diff available.
Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef.... ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Aug 26 14:38:32 2017 @@ -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 */
-
gadamopoulos＠svn.reactos.org