diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index e80b899409d..b1c33cc1424 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -849,7 +849,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() hResult = CreateToolsBar(&toolsBar); if (FAILED(hResult)) return hResult; - AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS); + AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count hResult = fControlsBar->QueryInterface(IID_PPV_ARG(IOleWindow, &toolbarOleWindow)); if (FAILED(hResult)) @@ -862,7 +862,7 @@ HRESULT STDMETHODCALLTYPE CInternetToolbar::InitNew() hResult = CreateAddressBand(&navigationBar); if (FAILED(hResult)) return hResult; - AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS); + AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); hResult = navigationBar->QueryInterface(IID_PPV_ARG(IOleWindow, &navigationOleWindow)); hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); diff --git a/dll/win32/browseui/toolsband.cpp b/dll/win32/browseui/toolsband.cpp index f04815bbcd6..8cd95bbf92f 100644 --- a/dll/win32/browseui/toolsband.cpp +++ b/dll/win32/browseui/toolsband.cpp @@ -278,14 +278,17 @@ HRESULT STDMETHODCALLTYPE CToolsBand::SetSite(IUnknown* pUnkSite) LoadImage(shell32Instance, MAKEINTRESOURCE(214), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); - DIBSECTION bitmapInfo; - GetObjectW(imageBitmap, sizeof(bitmapInfo), &bitmapInfo); - HIMAGELIST imageList = ImageList_Create(bitmapInfo.dsBm.bmHeight, bitmapInfo.dsBm.bmHeight, ILC_COLOR32, 4, 4); + if (imageBitmap) + { + DIBSECTION bitmapInfo; + GetObjectW(imageBitmap, sizeof(bitmapInfo), &bitmapInfo); + HIMAGELIST imageList = ImageList_Create(bitmapInfo.dsBm.bmHeight, bitmapInfo.dsBm.bmHeight, ILC_COLOR32, 4, 4); - ImageList_Add(imageList, imageBitmap, NULL); - DeleteObject(imageBitmap); + ImageList_Add(imageList, imageBitmap, NULL); + DeleteObject(imageBitmap); - SendMessage(TB_SETIMAGELIST, 0, (LPARAM)imageList); + SendMessage(TB_SETIMAGELIST, 0, (LPARAM) imageList); + } SendMessage(TB_ADDBUTTONSW, numShownButtons, (LPARAM)&tbButtonsAdd);