Index: dll/win32/browseui/aclmulti.cpp =================================================================== --- dll/win32/browseui/aclmulti.cpp (revision 58787) +++ dll/win32/browseui/aclmulti.cpp (working copy) @@ -55,12 +55,13 @@ if (punk == NULL) return E_FAIL; - fObjects = reinterpret_cast(CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * (fObjectCount + 1))); + fObjects = reinterpret_cast( + CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * (fObjectCount + 1))); fObjects[fObjectCount].punk = punk; punk->AddRef(); - if (FAILED(punk->QueryInterface(IID_IEnumString, (void **)&fObjects[fObjectCount].pEnum))) + if (FAILED(punk->QueryInterface(IID_IEnumString, reinterpret_cast(&fObjects[fObjectCount].pEnum)))) fObjects[fObjectCount].pEnum = NULL; - if (FAILED(punk->QueryInterface(IID_IACList, (void **)&fObjects[fObjectCount].pACL))) + if (FAILED(punk->QueryInterface(IID_IACList, reinterpret_cast(&fObjects[fObjectCount].pACL)))) fObjects[fObjectCount].pACL = NULL; fObjectCount++; return S_OK; @@ -75,9 +76,10 @@ if (fObjects[i].punk == punk) { release_obj(&fObjects[i]); - memmove(&fObjects[i], &fObjects[i + 1], (fObjectCount - i - 1) * sizeof(struct ACLMultiSublist)); + MoveMemory(&fObjects[i], &fObjects[i + 1], (fObjectCount - i - 1) * sizeof(ACLMultiSublist)); fObjectCount--; - fObjects = reinterpret_cast(CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * fObjectCount)); + fObjects = reinterpret_cast( + CoTaskMemRealloc(fObjects, sizeof(fObjects[0]) * fObjectCount)); return S_OK; } Index: dll/win32/browseui/aclmulti.h =================================================================== --- dll/win32/browseui/aclmulti.h (revision 58787) +++ dll/win32/browseui/aclmulti.h (working copy) @@ -61,14 +61,14 @@ public: -DECLARE_REGISTRY_RESOURCEID(IDR_ACLMULTI) -DECLARE_NOT_AGGREGATABLE(CACLMulti) + DECLARE_REGISTRY_RESOURCEID(IDR_ACLMULTI) + DECLARE_NOT_AGGREGATABLE(CACLMulti) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CACLMulti) - COM_INTERFACE_ENTRY_IID(IID_IEnumString, IEnumString) - COM_INTERFACE_ENTRY_IID(IID_IACList, IACList) - COM_INTERFACE_ENTRY_IID(IID_IObjMgr, IObjMgr) -END_COM_MAP() + BEGIN_COM_MAP(CACLMulti) + COM_INTERFACE_ENTRY_IID(IID_IEnumString, IEnumString) + COM_INTERFACE_ENTRY_IID(IID_IACList, IACList) + COM_INTERFACE_ENTRY_IID(IID_IObjMgr, IObjMgr) + END_COM_MAP() }; Index: dll/win32/browseui/addressband.cpp =================================================================== --- dll/win32/browseui/addressband.cpp (revision 58787) +++ dll/win32/browseui/addressband.cpp (working copy) @@ -110,11 +110,14 @@ fSite.Release(); if (pUnkSite == NULL) return S_OK; - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, (void **)&fSite); + + hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast(&fSite)); if (FAILED(hResult)) return hResult; + + // get window handle of parent parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (SUCCEEDED(hResult)) { oleWindow->GetWindow(&parentWindow); @@ -123,23 +126,29 @@ if (!::IsWindow(parentWindow)) return E_FAIL; + // create combo box ex toolbar = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY, 0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0); if (toolbar == NULL) return E_FAIL; SubclassWindow(toolbar); - SendMessage(CBEM_SETEXTENDEDSTYLE, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT); - fEditControl = (HWND)SendMessage(CBEM_GETEDITCONTROL, 0, 0); - fComboBox = (HWND)SendMessage(CBEM_GETCOMBOCONTROL, 0, 0); + + SendMessage(CBEM_SETEXTENDEDSTYLE, + CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT, CBES_EX_CASESENSITIVE | CBES_EX_NOSIZELIMIT); + + fEditControl = reinterpret_cast(SendMessage(CBEM_GETEDITCONTROL, 0, 0)); + fComboBox = reinterpret_cast(SendMessage(CBEM_GETCOMBOCONTROL, 0, 0)); #if 1 - hResult = CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, IID_IAddressEditBox, (void **)&fAddressEditBox); + hResult = CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, + IID_IAddressEditBox, reinterpret_cast(&fAddressEditBox)); if (FAILED(hResult)) return hResult; #else // instantiate new version #endif - hResult = fAddressEditBox->QueryInterface(IID_IShellService, (void **)&shellService); + + hResult = fAddressEditBox->QueryInterface(IID_IShellService, reinterpret_cast(&shellService)); if (FAILED(hResult)) return hResult; hResult = fAddressEditBox->Init(toolbar, fEditControl, 8, pUnkSite /*(IAddressBand *)this*/ ); @@ -153,17 +162,21 @@ fGoButtonShown = true; shellInstance = GetModuleHandle(_T("shell32.dll")); - normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + normalImagelist = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); + hotImageList = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT), + 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_LIST | - TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE, - 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + fGoButton = CreateWindowEx(WS_EX_TOOLWINDOW, TOOLBARCLASSNAMEW, 0, WS_CHILD | WS_CLIPSIBLINGS | + WS_CLIPCHILDREN | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | + CCS_NOPARENTALIGN | CCS_NORESIZE, + 0, 0, 0, 0, m_hWnd, NULL, _AtlBaseModule.GetModuleInstance(), NULL); SendMessage(fGoButton, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessage(fGoButton, TB_SETMAXTEXTROWS, 1, 0); - SendMessage(fGoButton, TB_SETIMAGELIST, 0, (LPARAM)normalImagelist); - SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, (LPARAM)hotImageList); - SendMessage(fGoButton, TB_ADDSTRINGW, (WPARAM)_AtlBaseModule.GetResourceInstance(), IDS_GOBUTTONLABEL); + SendMessage(fGoButton, TB_SETIMAGELIST, 0, reinterpret_cast(normalImagelist)); + SendMessage(fGoButton, TB_SETHOTIMAGELIST, 0, reinterpret_cast(hotImageList)); + SendMessage(fGoButton, TB_ADDSTRINGW, + reinterpret_cast(_AtlBaseModule.GetResourceInstance()), IDS_GOBUTTONLABEL); SendMessage(fGoButton, TB_ADDBUTTONSW, 1, (LPARAM)&buttonInfo); return hResult; @@ -201,7 +214,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CAddressBand::ResizeBorderDW(const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +HRESULT STDMETHODCALLTYPE CAddressBand::ResizeBorderDW( + const RECT *prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) { return E_NOTIMPL; } @@ -218,18 +232,20 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CAddressBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CAddressBand::QueryStatus( + const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { CComPtr oleCommandTarget; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); + hResult = fAddressEditBox->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); if (FAILED(hResult)) return hResult; return oleCommandTarget->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); } -HRESULT STDMETHODCALLTYPE CAddressBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CAddressBand::Exec(const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { // incomplete return E_NOTIMPL; @@ -255,16 +271,17 @@ if (fActivate) { - hResult = fSite->QueryInterface(IID_IInputObjectSite, (void **)&inputObjectSite); + hResult = fSite->QueryInterface(IID_IInputObjectSite, reinterpret_cast(&inputObjectSite)); if (FAILED(hResult)) return hResult; - hResult = inputObjectSite->OnFocusChangeIS((IDeskBand *)this, fActivate); + hResult = inputObjectSite->OnFocusChangeIS(static_cast(this), fActivate); SetFocus(); } return S_OK; } -HRESULT STDMETHODCALLTYPE CAddressBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT STDMETHODCALLTYPE CAddressBand::OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { CComPtr winEventHandler; HRESULT hResult; @@ -282,7 +299,7 @@ } break; } - hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); + hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); if (FAILED(hResult)) return hResult; return winEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); @@ -293,7 +310,7 @@ CComPtr winEventHandler; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); + hResult = fAddressEditBox->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); if (FAILED(hResult)) return hResult; return winEventHandler->IsWindowOwner(hWnd); @@ -304,7 +321,7 @@ CComPtr addressBand; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, (void **)&addressBand); + hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, reinterpret_cast(&addressBand)); if (FAILED(hResult)) return hResult; return addressBand->FileSysChange(param8, paramC); @@ -315,7 +332,7 @@ CComPtr addressBand; HRESULT hResult; - hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, (void **)&addressBand); + hResult = fAddressEditBox->QueryInterface(IID_IAddressBand, reinterpret_cast(&addressBand)); if (FAILED(hResult)) return hResult; return addressBand->Refresh(param8); @@ -398,9 +415,9 @@ pt.y = 0; parentWindow = GetParent(); ::MapWindowPoints(m_hWnd, parentWindow, &pt, 1); - OffsetWindowOrgEx((HDC)wParam, pt.x, pt.y, &ptOrig); + OffsetWindowOrgEx(reinterpret_cast(wParam), pt.x, pt.y, &ptOrig); result = SendMessage(parentWindow, WM_ERASEBKGND, wParam, 0); - SetWindowOrgEx((HDC)wParam, ptOrig.x, ptOrig.y, NULL); + SetWindowOrgEx(reinterpret_cast(wParam), ptOrig.x, ptOrig.y, NULL); if (result == 0) { bHandled = FALSE; @@ -424,20 +441,25 @@ bHandled = FALSE; return 0; } + newHeight = HIWORD(lParam); newWidth = LOWORD(lParam); - SendMessage(fGoButton, TB_GETITEMRECT, 0, (LPARAM)&buttonBounds); + + SendMessage(fGoButton, TB_GETITEMRECT, 0, reinterpret_cast(&buttonBounds)); buttonWidth = buttonBounds.right - buttonBounds.left; buttonHeight = buttonBounds.bottom - buttonBounds.top; + DefWindowProc(WM_SIZE, wParam, MAKELONG(newWidth - buttonWidth - 2, newHeight)); ::GetWindowRect(fComboBox, &comboBoxBounds); ::SetWindowPos(fGoButton, NULL, newWidth - buttonWidth, (comboBoxBounds.bottom - comboBoxBounds.top - buttonHeight) / 2, buttonWidth, buttonHeight, SWP_NOOWNERZORDER | SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER); + goButtonBounds.left = newWidth - buttonWidth; goButtonBounds.top = 0; goButtonBounds.right = newWidth - buttonWidth; goButtonBounds.bottom = newHeight; InvalidateRect(&goButtonBounds, TRUE); + SendMessage(fComboBox, CB_SETDROPPEDWIDTH, 200, 0); return 0; } @@ -453,27 +475,31 @@ long newHeight; long newWidth; - if (fGoButtonShown == false) + if (!fGoButtonShown) { bHandled = FALSE; return 0; } - positionInfoCopy = *(WINDOWPOS *)lParam; + + positionInfoCopy = *reinterpret_cast(lParam); newHeight = positionInfoCopy.cy; newWidth = positionInfoCopy.cx; - SendMessage(fGoButton, TB_GETITEMRECT, 0, (LPARAM)&buttonBounds); + SendMessage(fGoButton, TB_GETITEMRECT, 0, reinterpret_cast(&buttonBounds)); + buttonWidth = buttonBounds.right - buttonBounds.left; buttonHeight = buttonBounds.bottom - buttonBounds.top; positionInfoCopy.cx = newWidth - 2 - buttonWidth; - DefWindowProc(WM_WINDOWPOSCHANGING, wParam, (LPARAM)&positionInfoCopy); + DefWindowProc(WM_WINDOWPOSCHANGING, wParam, reinterpret_cast(&positionInfoCopy)); ::GetWindowRect(fComboBox, &comboBoxBounds); ::SetWindowPos(fGoButton, NULL, newWidth - buttonWidth, (comboBoxBounds.bottom - comboBoxBounds.top - buttonHeight) / 2, buttonWidth, buttonHeight, SWP_NOOWNERZORDER | SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER); + goButtonBounds.left = newWidth - buttonWidth; goButtonBounds.top = 0; goButtonBounds.right = newWidth - buttonWidth; goButtonBounds.bottom = newHeight; InvalidateRect(&goButtonBounds, TRUE); + SendMessage(fComboBox, CB_SETDROPPEDWIDTH, 200, 0); return 0; } @@ -489,8 +515,8 @@ ATLTRY (theMenuBar = new CComObject); if (theMenuBar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theMenuBar->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theMenuBar; return hResult; Index: dll/win32/browseui/addressband.h =================================================================== --- dll/win32/browseui/addressband.h (revision 58787) +++ dll/win32/browseui/addressband.h (working copy) @@ -102,31 +102,31 @@ LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWindowPosChanging(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -BEGIN_MSG_MAP(CAddressBand) - NOTIFY_CODE_HANDLER(NM_CLICK, OnNotifyClick) - NOTIFY_CODE_HANDLER(TTN_NEEDTEXTW, OnTipText) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChanging) -END_MSG_MAP() + BEGIN_MSG_MAP(CAddressBand) + NOTIFY_CODE_HANDLER(NM_CLICK, OnNotifyClick) + NOTIFY_CODE_HANDLER(TTN_NEEDTEXTW, OnTipText) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGING, OnWindowPosChanging) + END_MSG_MAP() -DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSBAND) -DECLARE_NOT_AGGREGATABLE(CAddressBand) + DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSBAND) + DECLARE_NOT_AGGREGATABLE(CAddressBand) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CAddressBand) - COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IAddressBand, IAddressBand) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) -END_COM_MAP() + BEGIN_COM_MAP(CAddressBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IAddressBand, IAddressBand) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + END_COM_MAP() }; Index: dll/win32/browseui/addresseditbox.cpp =================================================================== --- dll/win32/browseui/addresseditbox.cpp (revision 58787) +++ dll/win32/browseui/addresseditbox.cpp (working copy) @@ -90,7 +90,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT STDMETHODCALLTYPE CAddressEditBox::OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { // handle fill of listbox here return E_NOTIMPL; @@ -101,12 +102,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressEditBox::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CAddressEditBox::QueryStatus( + const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressEditBox::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CAddressEditBox::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { return E_NOTIMPL; } @@ -121,12 +124,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressEditBox::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT STDMETHODCALLTYPE CAddressEditBox::GetIDsOfNames( + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { // on navigate complete, change edit section of combobox return E_NOTIMPL; @@ -171,8 +176,8 @@ ATLTRY (theMenuBar = new CComObject); if (theMenuBar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theMenuBar->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theMenuBar; return hResult; Index: dll/win32/browseui/addresseditbox.h =================================================================== --- dll/win32/browseui/addresseditbox.h (revision 58787) +++ dll/win32/browseui/addresseditbox.h (working copy) @@ -81,29 +81,29 @@ // LRESULT OnSetFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); // LRESULT OnKillFocus(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSEDITBOX) -DECLARE_NOT_AGGREGATABLE(CAddressEditBox) + DECLARE_REGISTRY_RESOURCEID(IDR_ADDRESSEDITBOX) + DECLARE_NOT_AGGREGATABLE(CAddressEditBox) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_MSG_MAP(CAddressEditBox) -// MESSAGE_HANDLER(WM_NOTIFY, OnNotify) -// MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) -// MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) -// ALT_MSG_MAP(1) -// MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocusSaveButton) -// ALT_MSG_MAP(2) -// MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocusSelectButton) -END_MSG_MAP() + BEGIN_MSG_MAP(CAddressEditBox) + // MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + // MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocus) + // MESSAGE_HANDLER(WM_KILLFOCUS, OnKillFocus) + // ALT_MSG_MAP(1) + // MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocusSaveButton) + // ALT_MSG_MAP(2) + // MESSAGE_HANDLER(WM_SETFOCUS, OnSetFocusSelectButton) + END_MSG_MAP() -BEGIN_COM_MAP(CAddressEditBox) - COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) - COM_INTERFACE_ENTRY_IID(IID_IAddressBand, IAddressBand) - COM_INTERFACE_ENTRY_IID(IID_IAddressEditBox, IAddressEditBox) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) -END_COM_MAP() + BEGIN_COM_MAP(CAddressEditBox) + COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) + COM_INTERFACE_ENTRY_IID(IID_IAddressBand, IAddressBand) + COM_INTERFACE_ENTRY_IID(IID_IAddressEditBox, IAddressEditBox) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + END_COM_MAP() }; Index: dll/win32/browseui/bandproxy.cpp =================================================================== --- dll/win32/browseui/bandproxy.cpp (revision 58787) +++ dll/win32/browseui/bandproxy.cpp (working copy) @@ -42,11 +42,12 @@ if (browser == NULL) return E_POINTER; - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return hResult; - hResult = serviceProvider->QueryService(SID_IWebBrowserApp, IID_IWebBrowser2, (void **)&webBrowser); - if (FAILED (hResult)) + hResult = serviceProvider->QueryService( + SID_IWebBrowserApp, IID_IWebBrowser2, reinterpret_cast(&webBrowser)); + if (FAILED(hResult)) return hResult; *browser = webBrowser.Detach(); return S_OK; @@ -76,7 +77,7 @@ HRESULT hResult; hResult = FindBrowserWindow(&webBrowser); - if (FAILED (hResult) || webBrowser.p == NULL) + if (FAILED(hResult) || webBrowser.p == NULL) return S_FALSE; return S_OK; } @@ -94,17 +95,18 @@ HRESULT hResult; hResult = FindBrowserWindow(&webBrowserUnknown); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; - hResult = webBrowserUnknown->QueryInterface(IID_IWebBrowserApp, (void **)&webBrowser); - if (FAILED (hResult)) + hResult = webBrowserUnknown->QueryInterface(IID_IWebBrowserApp, reinterpret_cast(&webBrowser)); + if (FAILED(hResult)) return hResult; hResult = webBrowser->put_Visible(TRUE); - hResult = webBrowser->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (SUCCEEDED (hResult)) + hResult = webBrowser->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (SUCCEEDED(hResult)) { - hResult = serviceProvider->QueryService(SID_STopLevelBrowser, IID_IOleWindow, (void **)&oleWindow); - if (SUCCEEDED (hResult)) + hResult = serviceProvider->QueryService(SID_STopLevelBrowser, + IID_IOleWindow, reinterpret_cast(&oleWindow)); + if (SUCCEEDED(hResult)) { hResult = oleWindow->GetWindow(&browserWindow); if (IsIconic(browserWindow)) @@ -118,7 +120,7 @@ return E_OUTOFMEMORY; memcpy(V_ARRAY(&args)->pvData, pidl, arraySize); hResult = webBrowser->Navigate2(&args, &emptyVariant, &emptyVariant, &emptyVariant, &emptyVariant); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; return S_OK; } @@ -139,8 +141,8 @@ ATLTRY (theBandProxy = new CComObject); if (theBandProxy == NULL) return E_OUTOFMEMORY; - hResult = theBandProxy->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theBandProxy->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theBandProxy; return hResult; Index: dll/win32/browseui/bandproxy.h =================================================================== --- dll/win32/browseui/bandproxy.h (revision 58787) +++ dll/win32/browseui/bandproxy.h (working copy) @@ -40,12 +40,12 @@ virtual HRESULT STDMETHODCALLTYPE NavigateToPIDL(LPCITEMIDLIST pidl); virtual HRESULT STDMETHODCALLTYPE NavigateToURL(long paramC, long param10); -DECLARE_REGISTRY_RESOURCEID(IDR_BANDPROXY) -DECLARE_NOT_AGGREGATABLE(CBandProxy) + DECLARE_REGISTRY_RESOURCEID(IDR_BANDPROXY) + DECLARE_NOT_AGGREGATABLE(CBandProxy) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CBandProxy) - COM_INTERFACE_ENTRY_IID(IID_IBandProxy, IBandProxy) -END_COM_MAP() + BEGIN_COM_MAP(CBandProxy) + COM_INTERFACE_ENTRY_IID(IID_IBandProxy, IBandProxy) + END_COM_MAP() }; Index: dll/win32/browseui/bandsite.cpp =================================================================== --- dll/win32/browseui/bandsite.cpp (revision 58787) +++ dll/win32/browseui/bandsite.cpp (working copy) @@ -1,8 +1,8 @@ /* - * Rebar band site + * Rebar band site * - * Copyright 2007 Hervé Poussineau - * Copyright 2009 Andrew Hill + * Copyright 2007 Hervé Poussineau + * Copyright 2009 Andrew Hill * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -67,7 +67,7 @@ DWORD CBandSiteBase::GetBandSiteViewMode() { - DWORD dwStyle; + DWORD dwStyle; /* FIXME: What about DBIF_VIEWMODE_FLOATING and DBIF_VIEWMODE_TRANSPARENT? */ dwStyle = GetWindowLongPtr(fRebarWindow, GWL_STYLE); @@ -80,7 +80,7 @@ VOID CBandSiteBase::BuildRebarBandInfo(struct BandObject *Band, REBARBANDINFOW *prbi) { - memset(prbi, 0, sizeof(*prbi)); + ZeroMemory(prbi, sizeof(*prbi)); prbi->cbSize = sizeof(*prbi); prbi->fMask = RBBIM_ID; @@ -156,12 +156,12 @@ HRESULT CBandSiteBase::UpdateSingleBand(struct BandObject *Band) { - REBARBANDINFOW rbi; - DWORD dwViewMode; - UINT uBand; - HRESULT hRet; + REBARBANDINFOW rbi; + DWORD dwViewMode; + UINT uBand; + HRESULT hRet; - memset(&Band->dbi, 0, sizeof(Band->dbi)); + ZeroMemory(&Band->dbi, sizeof(Band->dbi)); Band->dbi.dwMask = DBIM_MINSIZE | DBIM_MAXSIZE | DBIM_INTEGRAL | DBIM_ACTUAL | DBIM_TITLE | DBIM_MODEFLAGS | DBIM_BKCOLOR; @@ -178,10 +178,10 @@ WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); } - uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); + uBand = (UINT)(SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0)); if (uBand != (UINT)-1) { - if (!SendMessageW(fRebarWindow, RB_SETBANDINFOW, (WPARAM)uBand, (LPARAM)&rbi)) + if (!SendMessageW(fRebarWindow, RB_SETBANDINFOW, (WPARAM)uBand, reinterpret_cast(&rbi))) { WARN("Failed to update the rebar band!\n"); } @@ -196,15 +196,15 @@ HRESULT CBandSiteBase::UpdateAllBands() { - LONG i; - HRESULT hRet; + LONG i; + HRESULT hRet; for (i = 0; i < fBandsAllocated; i++) { if (fBands[i].DeskBand != NULL) { hRet = UpdateSingleBand(&fBands[i]); - if (!SUCCEEDED(hRet)) + if (FAILED(hRet)) return hRet; } } @@ -214,7 +214,7 @@ HRESULT CBandSiteBase::UpdateBand(DWORD dwBandID) { - struct BandObject *Band; + struct BandObject *Band; Band = GetBandByID(dwBandID); if (Band == NULL) @@ -225,9 +225,9 @@ struct CBandSiteBase::BandObject *CBandSiteBase::GetBandFromHwnd(HWND hwnd) { - HRESULT hRet; - HWND hWndBand; - LONG i; + HRESULT hRet; + HWND hWndBand; + LONG i; for (i = 0; i < fBandsAllocated; i++) { @@ -258,8 +258,7 @@ if (fBands != NULL) { - int i; - for (i = 0; i < fBandsAllocated; i++) + for (INT i = 0; i < fBandsAllocated; i++) { if (fBands[i].DeskBand != NULL) FreeBand(&fBands[i]); @@ -271,32 +270,31 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::AddBand(IUnknown *punk) { - INT i; - LONG NewAllocated; - struct BandObject *NewBand = NULL; - CComPtr DeskBand; - CComPtr ObjWithSite; - CComPtr OleWindow; - CComPtr WndEvtHandler; - REBARBANDINFOW rbi; - HRESULT hRet; - UINT uBand; + LONG NewAllocated; + struct BandObject *NewBand = NULL; + CComPtr DeskBand; + CComPtr ObjWithSite; + CComPtr OleWindow; + CComPtr WndEvtHandler; + REBARBANDINFOW rbi; + HRESULT hRet; + UINT uBand; TRACE("(%p, %p)\n", this, punk); if (punk == NULL || fRebarWindow == NULL) return E_FAIL; - hRet = punk->QueryInterface(IID_IDeskBand, (PVOID *)&DeskBand); + hRet = punk->QueryInterface(IID_IDeskBand, reinterpret_cast(&DeskBand)); if (!SUCCEEDED(hRet) || DeskBand == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IObjectWithSite, (PVOID *)&ObjWithSite); + hRet = punk->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&ObjWithSite)); if (!SUCCEEDED(hRet) || ObjWithSite == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IOleWindow, (PVOID *)&OleWindow); + hRet = punk->QueryInterface(IID_IOleWindow, reinterpret_cast(&OleWindow)); if (!SUCCEEDED(hRet) || OleWindow == NULL) goto Cleanup; - hRet = punk->QueryInterface(IID_IWinEventHandler, (PVOID *)&WndEvtHandler); + hRet = punk->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&WndEvtHandler)); if (!SUCCEEDED(hRet) || WndEvtHandler == NULL) goto Cleanup; @@ -304,7 +302,7 @@ if (fBandsAllocated > fBandsCount) { /* Search for a free band object */ - for (i = 0; i < fBandsAllocated; i++) + for (INT i = 0; i < fBandsAllocated; i++) { if (fBands[i].DeskBand == NULL) { @@ -377,7 +375,7 @@ NewBand->WndEvtHandler = WndEvtHandler.Detach(); /* Create the ReBar band */ - hRet = ObjWithSite->SetSite((IOleWindow *)this); + hRet = ObjWithSite->SetSite(static_cast(this)); if (SUCCEEDED(hRet)) { uBand = 0xffffffff; @@ -399,7 +397,7 @@ WARN ("ReBar band uses child window 0x%p\n", rbi.hwndChild); } - if (!SendMessageW(fRebarWindow, RB_INSERTBANDW, (WPARAM)uBand, (LPARAM)&rbi)) + if (!SendMessageW(fRebarWindow, RB_INSERTBANDW, (WPARAM)uBand, reinterpret_cast(&rbi))) return E_FAIL; hRet = (HRESULT)((USHORT)GetBandID(NewBand)); @@ -433,7 +431,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::EnumBands(UINT uBand, DWORD *pdwBandID) { - DWORD i; + DWORD i; TRACE("(%p, %u, %p)\n", this, uBand, pdwBandID); @@ -460,9 +458,10 @@ return E_FAIL; } -HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryBand(DWORD dwBandID, IDeskBand **ppstb, + DWORD *pdwState, LPWSTR pszName, int cchName) { - struct BandObject *Band; + struct BandObject *Band; TRACE("(%p, %u, %p, %p, %p, %d)\n", this, dwBandID, ppstb, pdwState, pszName, cchName); @@ -492,7 +491,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState) { - struct BandObject *Band; + struct BandObject *Band; TRACE("(%p, %u, %x, %x)\n", this, dwBandID, dwMask, dwState); @@ -506,8 +505,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::RemoveBand(DWORD dwBandID) { - struct BandObject *Band; - UINT uBand; + struct BandObject *Band; + UINT uBand; TRACE("(%p, %u)\n", this, dwBandID); @@ -535,7 +534,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { - struct BandObject *Band; + struct BandObject *Band; TRACE("(%p, %u, %s, %p)\n", this, dwBandID, debugstr_guid(&riid), ppv); @@ -563,7 +562,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plrResult) { - struct BandObject *Band; + struct BandObject *Band; TRACE("(%p, %p, %u, %p, %p, %p)\n", this, hWnd, uMsg, wParam, lParam, plrResult); @@ -589,7 +588,7 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::IsWindowOwner(HWND hWnd) { - struct BandObject *Band; + struct BandObject *Band; TRACE("(%p, %p)\n", this, hWnd); @@ -622,36 +621,34 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetDeskBarSite(IUnknown *pUnk) { - HWND hWndParent; - HRESULT hRet; + HWND hWndParent; + HRESULT hRet; + DWORD style; TRACE("(%p, %p)\n", this, pUnk); fOleWindow.Release(); hRet = pUnk->QueryInterface(IID_IOleWindow, (PVOID *)&fOleWindow); - if (!SUCCEEDED(hRet)) + if (FAILED(hRet)) return E_FAIL; hRet = fOleWindow->GetWindow(&hWndParent); - if (!SUCCEEDED(hRet)) + if (FAILED(hRet)) return E_FAIL; + style = WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | + RBS_BANDBORDERS | CCS_NODIVIDER | CCS_NORESIZE | CCS_NOPARENTALIGN; + fRebarWindow = CreateWindowExW(WS_EX_TOOLWINDOW, - REBARCLASSNAMEW, - NULL, - WS_CHILD | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | RBS_VARHEIGHT | - RBS_BANDBORDERS | CCS_NODIVIDER | - CCS_NORESIZE | CCS_NOPARENTALIGN, - 0, - 0, - 0, - 0, - hWndParent, - NULL, - _AtlBaseModule.GetModuleInstance(), - NULL); + REBARCLASSNAMEW, + NULL, + style, + 0, 0, 0, 0, + hWndParent, + NULL, + _AtlBaseModule.GetModuleInstance(), + NULL); if (fRebarWindow == NULL) { fOleWindow.Release(); @@ -664,8 +661,8 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::SetModeDBC(DWORD dwMode) { - LONG dwStyle; - LONG dwPrevStyle; + LONG dwStyle; + LONG dwPrevStyle; TRACE("(%p, %x)\n", this, dwMode); @@ -705,15 +702,17 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryStatus(const GUID *pguidCmdGroup, DWORD cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryStatus(const GUID *pguidCmdGroup, + DWORD cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText) { FIXME("(%p, %p, %u, %p, %p)\n", this, pguidCmdGroup, cCmds, prgCmds, pCmdText); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdExecOpt, VARIANTARG *pvaIn, VARIANTARG *pvaOut) +HRESULT STDMETHODCALLTYPE CBandSiteBase::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdExecOpt, VARIANTARG *pvaIn, VARIANTARG *pvaOut) { - HRESULT hRet = S_OK; + HRESULT hRet = S_OK; TRACE("(%p, %p, %u, %u, %p, %p)\n", this, pguidCmdGroup, nCmdID, nCmdExecOpt, pvaIn, pvaOut); @@ -755,80 +754,81 @@ HRESULT STDMETHODCALLTYPE CBandSiteBase::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::HasFocusIO() { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::TranslateAcceleratorIO(LPMSG lpMsg) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::OnFocusChangeIS(struct IUnknown *paramC, int param10) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::GetClassID(CLSID *pClassID) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::IsDirty() { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::Load(IStream *pStm) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::Save(IStream *pStm, BOOL fClearDirty) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::GetSizeMax(ULARGE_INTEGER *pcbSize) { - return E_NOTIMPL; + return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBandSiteBase::DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT STDMETHODCALLTYPE CBandSiteBase::DragEnter( + IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::DragOver(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::DragLeave() { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::LoadFromStreamBS(IStream *, const GUID &, void **) { - return E_NOTIMPL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CBandSiteBase::SaveToStreamBS(IUnknown *, IStream *) { - return E_NOTIMPL; + return E_NOTIMPL; } Index: dll/win32/browseui/bandsite.h =================================================================== --- dll/win32/browseui/bandsite.h (revision 58787) +++ dll/win32/browseui/bandsite.h (working copy) @@ -121,20 +121,20 @@ HRESULT UpdateBand(DWORD dwBandID); struct BandObject *GetBandFromHwnd(HWND hwnd); -BEGIN_COM_MAP(CBandSiteBase) - COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IBandSiteHelper, IBandSiteHelper) -END_COM_MAP() + BEGIN_COM_MAP(CBandSiteBase) + COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IDeskBarClient, IDeskBarClient) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IBandSiteHelper, IBandSiteHelper) + END_COM_MAP() }; class CBandSite : @@ -143,9 +143,8 @@ { public: -DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITE) -DECLARE_NOT_AGGREGATABLE(CBandSite) + DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITE) + DECLARE_NOT_AGGREGATABLE(CBandSite) -DECLARE_PROTECT_FINAL_CONSTRUCT() - + DECLARE_PROTECT_FINAL_CONSTRUCT() }; Index: dll/win32/browseui/bandsitemenu.cpp =================================================================== --- dll/win32/browseui/bandsitemenu.cpp (revision 58787) +++ dll/win32/browseui/bandsitemenu.cpp (working copy) @@ -37,7 +37,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) +HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu( + HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) { FIXME("(%p, %p, %p, %p, %p, %p)\n", this, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); return E_NOTIMPL; @@ -49,7 +50,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax) +HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT uType, + UINT *pwReserved, LPSTR pszName, UINT cchMax) { FIXME("(%p, %p, %p, %p, %p, %p)\n", this, idCmd, uType, pwReserved, pszName, cchMax); return E_NOTIMPL; Index: dll/win32/browseui/bandsitemenu.h =================================================================== --- dll/win32/browseui/bandsitemenu.h (revision 58787) +++ dll/win32/browseui/bandsitemenu.h (working copy) @@ -43,15 +43,14 @@ // *** IContextMenu2 methods *** virtual HRESULT STDMETHODCALLTYPE HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); -DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITEMENU) -DECLARE_NOT_AGGREGATABLE(CBandSiteMenu) + DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITEMENU) + DECLARE_NOT_AGGREGATABLE(CBandSiteMenu) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CBandSiteMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) -END_COM_MAP() - + BEGIN_COM_MAP(CBandSiteMenu) + COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + END_COM_MAP() }; Index: dll/win32/browseui/basebar.cpp =================================================================== --- dll/win32/browseui/basebar.cpp (revision 58787) +++ dll/win32/browseui/basebar.cpp (working copy) @@ -72,11 +72,13 @@ virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); // *** IInputObjectSite specific methods *** - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS (IUnknown *punkObj, BOOL fSetFocus); + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); // *** IOleCommandTarget specific methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); @@ -176,10 +178,10 @@ RECT neededBorderSpace; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IDockingWindowSite, (void **)&dockingWindowSite); + hResult = fSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast(&dockingWindowSite)); if (FAILED(hResult)) return hResult; - hResult = dockingWindowSite->GetBorderDW((IDeskBar *)this, &availableBorderSpace); + hResult = dockingWindowSite->GetBorderDW(static_cast(this), &availableBorderSpace); if (FAILED(hResult)) return hResult; memset(&neededBorderSpace, 0, sizeof(neededBorderSpace)); @@ -190,7 +192,7 @@ else neededBorderSpace.bottom = fNeededSize + GetSystemMetrics(SM_CXFRAME); } - hResult = dockingWindowSite->SetBorderSpaceDW((IDeskBar *)this, &neededBorderSpace); + hResult = dockingWindowSite->SetBorderSpaceDW(static_cast(this), &neededBorderSpace); if (FAILED(hResult)) return hResult; return S_OK; @@ -234,12 +236,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBaseBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CBaseBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBaseBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CBaseBar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if (IsEqualIID(*pguidCmdGroup, CGID_Explorer)) { @@ -267,7 +271,7 @@ if (fSite == NULL) return E_FAIL; - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); if (FAILED(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser @@ -304,16 +308,17 @@ fClient.Release(); else { - hResult = punkClient->QueryInterface(IID_IUnknown, (void **)&fClient); + hResult = punkClient->QueryInterface(IID_IUnknown, reinterpret_cast(&fClient)); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = fSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); if (FAILED(hResult)) return hResult; - Create(ownerWindow, 0, NULL, WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_TOOLWINDOW); + Create(ownerWindow, 0, NULL, + WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, WS_EX_TOOLWINDOW); ReserveBorderSpace(); } return S_OK; @@ -465,7 +470,7 @@ result = 0; if (fClient.p != NULL) { - hResult = fClient->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); + hResult = fClient->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); if (SUCCEEDED(hResult) && winEventHandler.p != NULL) hResult = winEventHandler->OnWinEvent(NULL, uMsg, wParam, lParam, &result); } @@ -532,8 +537,8 @@ ATLTRY (theBaseBar = new CComObject); if (theBaseBar == NULL) return E_OUTOFMEMORY; - hResult = theBaseBar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theBaseBar->QueryInterface (riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theBaseBar; return hResult; Index: dll/win32/browseui/basebarsite.cpp =================================================================== --- dll/win32/browseui/basebarsite.cpp (revision 58787) +++ dll/win32/browseui/basebarsite.cpp (working copy) @@ -83,11 +83,12 @@ virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); // *** IWinEventHandler methods *** - virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); // *** IInputObjectSite specific methods *** - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS (IUnknown *punkObj, BOOL fSetFocus); + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); // *** IDeskBarClient methods *** virtual HRESULT STDMETHODCALLTYPE SetDeskBarSite(IUnknown *punkSite); @@ -96,13 +97,16 @@ virtual HRESULT STDMETHODCALLTYPE GetSize(DWORD dwWhich, LPRECT prc); // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); // *** IBandSite specific methods *** virtual HRESULT STDMETHODCALLTYPE AddBand(IUnknown *punk); virtual HRESULT STDMETHODCALLTYPE EnumBands(UINT uBand, DWORD *pdwBandID); - virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName); + virtual HRESULT STDMETHODCALLTYPE QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, + LPWSTR pszName, int cchName); virtual HRESULT STDMETHODCALLTYPE SetBandState(DWORD dwBandID, DWORD dwMask, DWORD dwState); virtual HRESULT STDMETHODCALLTYPE RemoveBand(DWORD dwBandID); virtual HRESULT STDMETHODCALLTYPE GetBandObject(DWORD dwBandID, REFIID riid, void **ppv); @@ -165,37 +169,44 @@ DWORD thisBandID; HRESULT hResult; - hResult = newBar->QueryInterface(IID_IPersist, (void **)&persist); + hResult = newBar->QueryInterface(IID_IPersist, reinterpret_cast(&persist)); if (FAILED(hResult)) return hResult; - hResult = newBar->QueryInterface(IID_IObjectWithSite, (void **)&site); + hResult = newBar->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&site)); if (FAILED(hResult)) return hResult; - hResult = newBar->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = newBar->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; - hResult = newBar->QueryInterface(IID_IDeskBand, (void **)&deskBand); + hResult = newBar->QueryInterface(IID_IDeskBand, reinterpret_cast(&deskBand)); if (FAILED(hResult)) return hResult; - hResult = newBar->QueryInterface(IID_IDockingWindow, (void **)&dockingWindow); + hResult = newBar->QueryInterface(IID_IDockingWindow, reinterpret_cast(&dockingWindow)); if (FAILED(hResult)) return hResult; - hResult = site->SetSite((IOleWindow *)this); + hResult = site->SetSite(static_cast(this)); if (FAILED(hResult)) return hResult; - newInfo = new CBarInfo; + ATLTRY(newInfo = new CBarInfo); if (newInfo == NULL) return E_OUTOFMEMORY; + + // set new bar info thisBandID = fNextBandID++; newInfo->fTheBar = newBar; newInfo->fBandID = thisBandID; hResult = persist->GetClassID(&newInfo->fBarClass); + + // get band info deskBandInfo.dwMask = DBIM_MINSIZE | DBIM_ACTUAL | DBIM_TITLE; deskBandInfo.wszTitle[0] = 0; hResult = deskBand->GetBandInfo(0, 0, &deskBandInfo); + + // insert band memset(&bandInfo, 0, sizeof(bandInfo)); bandInfo.cbSize = sizeof(bandInfo); - bandInfo.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_IDEALSIZE | RBBIM_TEXT | RBBIM_LPARAM | RBBIM_ID; + bandInfo.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_IDEALSIZE | RBBIM_TEXT | + RBBIM_LPARAM | RBBIM_ID; bandInfo.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; bandInfo.lpText = deskBandInfo.wszTitle; hResult = oleWindow->GetWindow(&bandInfo.hwndChild); @@ -207,9 +218,11 @@ bandInfo.cyMaxChild = 32000; bandInfo.cyIntegral = 1; bandInfo.cxIdeal = 0; //deskBandInfo.ptActual.x; - bandInfo.lParam = (LPARAM)newInfo; - SendMessage(RB_INSERTBANDW, -1, (LPARAM)&bandInfo); - hResult = dockingWindow->ShowDW(TRUE); // this call is what makes the tree fill with contents + bandInfo.lParam = reinterpret_cast(newInfo); + SendMessage(RB_INSERTBANDW, -1, reinterpret_cast(&bandInfo)); + + // this call is what makes the tree fill with contents + hResult = dockingWindow->ShowDW(TRUE); if (FAILED(hResult)) return hResult; // for now @@ -252,7 +265,7 @@ if (fDeskBarSite == NULL) return E_FAIL; - hResult = fDeskBarSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); + hResult = fDeskBarSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); if (FAILED(hResult)) return hResult; // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser @@ -261,7 +274,8 @@ return serviceProvider->QueryService(guidService, riid, ppvObject); } -HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT STDMETHODCALLTYPE CBaseBarSite::OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { CComPtr deskBar; CComPtr winEventHandler; @@ -275,14 +289,15 @@ notifyHeader = (NMHDR *)lParam; if (notifyHeader->hwndFrom == m_hWnd && notifyHeader->code == RBN_AUTOSIZE) { - hResult = fDeskBarSite->QueryInterface(IID_IDeskBar, (void **)&deskBar); + hResult = fDeskBarSite->QueryInterface(IID_IDeskBar, reinterpret_cast(&deskBar)); GetClientRect(&newBounds); hResult = deskBar->OnPosRectChangeDB(&newBounds); } } if (fCurrentActiveBar != NULL) { - hResult = fCurrentActiveBar->fTheBar->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); + hResult = fCurrentActiveBar->fTheBar->QueryInterface( + IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); if (SUCCEEDED(hResult) && winEventHandler.p != NULL) hResult = winEventHandler->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); } @@ -309,16 +324,16 @@ fDeskBarSite.Release(); else { - hResult = punkSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = punkSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; - hResult = punkSite->QueryInterface(IID_IUnknown, (void **)&fDeskBarSite); + hResult = punkSite->QueryInterface(IID_IUnknown, reinterpret_cast(&fDeskBarSite)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); if (FAILED(hResult)) return hResult; - m_hWnd = CreateWindow(REBARCLASSNAMEW, _T(""), WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | + m_hWnd = CreateWindow(REBARCLASSNAMEW, NULL, WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | RBS_REGISTERDROP | RBS_AUTOSIZE | RBS_VERTICALGRIPPER | RBS_DBLCLKTOGGLE | CCS_LEFT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE, 0, 0, 0, 0, ownerWindow, NULL, @@ -344,12 +359,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryStatus(const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBaseBarSite::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CBaseBarSite::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if (IsEqualIID(*pguidCmdGroup, IID_IDeskBand)) { @@ -379,7 +396,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, + DWORD *pdwState, LPWSTR pszName, int cchName) { return E_NOTIMPL; } @@ -449,7 +467,7 @@ { NMHDR *notifyHeader; - notifyHeader = (NMHDR *)lParam; + notifyHeader = reinterpret_cast(lParam); if (notifyHeader->hwndFrom == m_hWnd) { } @@ -467,8 +485,8 @@ ATLTRY (theBaseBarSite = new CComObject); if (theBaseBarSite == NULL) return E_OUTOFMEMORY; - hResult = theBaseBarSite->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theBaseBarSite->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theBaseBarSite; return hResult; Index: dll/win32/browseui/brandband.cpp =================================================================== --- dll/win32/browseui/brandband.cpp (revision 58787) +++ dll/win32/browseui/brandband.cpp (working copy) @@ -167,30 +167,40 @@ // TODO: revoke brand band service return S_OK; } - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, (void **)&fSite); + + // get window handle of parent + hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast(&fSite)); if (FAILED(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (SUCCEEDED(hResult)) hResult = oleWindow->GetWindow(&parentWindow); if (!::IsWindow(parentWindow)) return E_FAIL; - hwnd = SHCreateWorkerWindowW(0, parentWindow, 0, WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, NULL, 0); + // create worker window in parent window + hwnd = SHCreateWorkerWindowW(0, parentWindow, 0, + WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, NULL, 0); if (hwnd == NULL) return E_FAIL; SubclassWindow(hwnd); - hResult = pUnkSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); + + // take advice to watch events + hResult = pUnkSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); if (SUCCEEDED(hResult)) { - hResult = serviceProvider->QueryService(SID_SBrandBand, IID_IProfferService, (void **)&profferService); + hResult = serviceProvider->QueryService( + SID_SBrandBand, IID_IProfferService, reinterpret_cast(&profferService)); if (SUCCEEDED(hResult)) - hResult = profferService->ProfferService(SID_SBrandBand, (IServiceProvider *)this, &fProfferCookie); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, (void **)&browserService); + hResult = profferService->ProfferService(SID_SBrandBand, + static_cast(this), &fProfferCookie); + hResult = serviceProvider->QueryService(SID_SShellBrowser, + IID_IBrowserService, reinterpret_cast(&browserService)); if (SUCCEEDED(hResult)) - hResult = AtlAdvise(browserService, (IDispatch *)this, DIID_DWebBrowserEvents, &fAdviseCookie); + hResult = AtlAdvise(browserService, static_cast(this), DIID_DWebBrowserEvents, &fAdviseCookie); } + // ignore any hResult errors up to here - they are nonfatal hResult = S_OK; SelectImage(); @@ -234,7 +244,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CBrandBand::ResizeBorderDW(const RECT* prcBorder, IUnknown* punkToolbarSite, BOOL fReserved) +HRESULT STDMETHODCALLTYPE CBrandBand::ResizeBorderDW( + const RECT* prcBorder, IUnknown* punkToolbarSite, BOOL fReserved) { return E_NOTIMPL; } @@ -296,7 +307,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBrandBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT STDMETHODCALLTYPE CBrandBand::OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { return E_NOTIMPL; } @@ -308,12 +320,14 @@ return S_FALSE; } -HRESULT STDMETHODCALLTYPE CBrandBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CBrandBand::QueryStatus( + const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBrandBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CBrandBand::Exec(const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if (IsEqualIID(*pguidCmdGroup, CGID_PrivCITCommands)) { @@ -340,8 +354,8 @@ if (IsEqualIID(guidService, SID_SBrandBand)) return this->QueryInterface(riid, ppvObject); - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return hResult; return serviceProvider->QueryService(guidService, riid, ppvObject); } @@ -356,12 +370,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBrandBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT STDMETHODCALLTYPE CBrandBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CBrandBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +HRESULT STDMETHODCALLTYPE CBrandBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { if (pDispParams == NULL) return E_INVALIDARG; @@ -431,7 +447,7 @@ FillSolidRect(dc, &paintInfo.rcPaint, RGB(255, 255, 255)); sourceDC = CreateCompatibleDC(dc); - oldBitmap = (HBITMAP)SelectObject(sourceDC, fImageBitmap); + oldBitmap = reinterpret_cast(SelectObject(sourceDC, fImageBitmap)); BitBlt(dc, destinationPoint.x, destinationPoint.y, fBitmapSize, fBitmapSize, sourceDC, 0, fCurrentFrame * fBitmapSize, SRCCOPY); @@ -462,8 +478,8 @@ ATLTRY (theMenuBar = new CComObject); if (theMenuBar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theMenuBar->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theMenuBar; return hResult; Index: dll/win32/browseui/brandband.h =================================================================== --- dll/win32/browseui/brandband.h (revision 58787) +++ dll/win32/browseui/brandband.h (working copy) @@ -101,29 +101,29 @@ LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -BEGIN_MSG_MAP(CBrandBand) -// MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) - MESSAGE_HANDLER(WM_PAINT, OnPaint) - MESSAGE_HANDLER(WM_TIMER, OnTimer) -END_MSG_MAP() + BEGIN_MSG_MAP(CBrandBand) + // MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_TIMER, OnTimer) + END_MSG_MAP() -DECLARE_REGISTRY_RESOURCEID(IDR_BRANDBAND) -DECLARE_NOT_AGGREGATABLE(CBrandBand) + DECLARE_REGISTRY_RESOURCEID(IDR_BRANDBAND) + DECLARE_NOT_AGGREGATABLE(CBrandBand) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CBrandBand) - COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) -END_COM_MAP() + BEGIN_COM_MAP(CBrandBand) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + END_COM_MAP() }; Index: dll/win32/browseui/browseuiord.cpp =================================================================== --- dll/win32/browseui/browseuiord.cpp (revision 58787) +++ dll/win32/browseui/browseuiord.cpp (working copy) @@ -97,7 +97,8 @@ /************************************************************************* * SHCreateIETHREADPARAM [BROWSEUI.123] */ -extern "C" IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM(long param8, long paramC, IUnknown *param10, IUnknown *param14) +extern "C" IEThreadParamBlock *WINAPI SHCreateIETHREADPARAM( + long param8, long paramC, IUnknown *param10, IUnknown *param14) { IEThreadParamBlock *result; @@ -250,7 +251,8 @@ /************************************************************************* * SHWriteClassesOfCategories [BROWSEUI.137] */ -extern "C" HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10, long param14, long param18, long param1C, long param20) +extern "C" HRESULT WINAPI SHWriteClassesOfCategories(long param8, long paramC, long param10, + long param14, long param18, long param1C, long param20) { return E_NOTIMPL; } Index: dll/win32/browseui/commonbrowser.cpp =================================================================== --- dll/win32/browseui/commonbrowser.cpp (revision 58787) +++ dll/win32/browseui/commonbrowser.cpp (working copy) @@ -33,12 +33,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CCommonBrowser::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CCommonBrowser::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { return E_NOTIMPL; } @@ -253,7 +255,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::CreateViewWindow(IShellView *psvNew, IShellView *psvOld, LPRECT prcView, HWND *phwnd) +HRESULT STDMETHODCALLTYPE CCommonBrowser::CreateViewWindow( + IShellView *psvNew, IShellView *psvOld, LPRECT prcView, HWND *phwnd) { return E_NOTIMPL; } @@ -363,12 +366,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::_ExecChildren(IUnknown *punkBar, BOOL fBroadcast, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut) +HRESULT STDMETHODCALLTYPE CCommonBrowser::_ExecChildren(IUnknown *punkBar, BOOL fBroadcast, + const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::_SendChildren(HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT STDMETHODCALLTYPE CCommonBrowser::_SendChildren( + HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam) { return E_NOTIMPL; } @@ -468,7 +473,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::v_MayGetNextToolbarFocus(LPMSG lpMsg, UINT itbNext, int citb, LPTOOLBARITEM *pptbi, HWND *phwnd) +HRESULT STDMETHODCALLTYPE CCommonBrowser::v_MayGetNextToolbarFocus(LPMSG lpMsg, UINT itbNext, + int citb, LPTOOLBARITEM *pptbi, HWND *phwnd) { return E_NOTIMPL; } @@ -508,7 +514,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayNameEx(unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *) +HRESULT STDMETHODCALLTYPE CCommonBrowser::IEParseDisplayNameEx( + unsigned int, const unsigned short *, DWORD, LPITEMIDLIST *) { return E_NOTIMPL; } Index: dll/win32/browseui/commonbrowser.h =================================================================== --- dll/win32/browseui/commonbrowser.h (revision 58787) +++ dll/win32/browseui/commonbrowser.h (working copy) @@ -186,22 +186,22 @@ virtual HRESULT STDMETHODCALLTYPE DragLeave(); virtual HRESULT STDMETHODCALLTYPE Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect); -DECLARE_REGISTRY_RESOURCEID(IDR_COMMONBROWSER) + DECLARE_REGISTRY_RESOURCEID(IDR_COMMONBROWSER) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CCommonBrowser) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IBrowserService, IBrowserService) - COM_INTERFACE_ENTRY_IID(IID_IBrowserService2, IBrowserService2) - COM_INTERFACE_ENTRY_IID(IID_IBrowserService3, IBrowserService3) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowserService, IShellBrowserService) - COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDockingWindowSite) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindowSite, IDockingWindowSite) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindowFrame, IDockingWindowFrame) - COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) -END_COM_MAP() + BEGIN_COM_MAP(CCommonBrowser) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IBrowserService, IBrowserService) + COM_INTERFACE_ENTRY_IID(IID_IBrowserService2, IBrowserService2) + COM_INTERFACE_ENTRY_IID(IID_IBrowserService3, IBrowserService3) + COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) + COM_INTERFACE_ENTRY_IID(IID_IShellBrowserService, IShellBrowserService) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDockingWindowSite) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindowSite, IDockingWindowSite) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindowFrame, IDockingWindowFrame) + COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + END_COM_MAP() }; Index: dll/win32/browseui/globalfoldersettings.cpp =================================================================== --- dll/win32/browseui/globalfoldersettings.cpp (revision 58787) +++ dll/win32/browseui/globalfoldersettings.cpp (working copy) @@ -33,7 +33,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CGlobalFolderSettings::Set(const DEFFOLDERSETTINGS *paramC, int param10, unsigned int param14) +HRESULT STDMETHODCALLTYPE CGlobalFolderSettings::Set( + const DEFFOLDERSETTINGS *paramC, int param10, unsigned int param14) { return E_NOTIMPL; } Index: dll/win32/browseui/globalfoldersettings.h =================================================================== --- dll/win32/browseui/globalfoldersettings.h (revision 58787) +++ dll/win32/browseui/globalfoldersettings.h (working copy) @@ -34,12 +34,12 @@ virtual HRESULT STDMETHODCALLTYPE Get(DEFFOLDERSETTINGS *paramC, int param10); virtual HRESULT STDMETHODCALLTYPE Set(const DEFFOLDERSETTINGS *paramC, int param10, unsigned int param14); -DECLARE_REGISTRY_RESOURCEID(IDR_GLOBALFOLDERSETTINGS) -DECLARE_NOT_AGGREGATABLE(CGlobalFolderSettings) + DECLARE_REGISTRY_RESOURCEID(IDR_GLOBALFOLDERSETTINGS) + DECLARE_NOT_AGGREGATABLE(CGlobalFolderSettings) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CGlobalFolderSettings) - COM_INTERFACE_ENTRY_IID(IID_IGlobalFolderSettings, IGlobalFolderSettings) -END_COM_MAP() + BEGIN_COM_MAP(CGlobalFolderSettings) + COM_INTERFACE_ENTRY_IID(IID_IGlobalFolderSettings, IGlobalFolderSettings) + END_COM_MAP() }; Index: dll/win32/browseui/internettoolbar.cpp =================================================================== --- dll/win32/browseui/internettoolbar.cpp (revision 58787) +++ dll/win32/browseui/internettoolbar.cpp (working copy) @@ -115,8 +115,10 @@ virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus); // *** IOleCommandTarget specific methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); // *** IServiceProvider methods *** virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); @@ -154,13 +156,13 @@ REBARBANDINFOW bandInfo; HRESULT hResult; - hResult = containedBand->QueryInterface(IID_IObjectWithSite, (void **)&site); + hResult = containedBand->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&site)); if (FAILED(hResult)) return hResult; - hResult = containedBand->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = containedBand->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; - hResult = containedBand->QueryInterface(IID_IDeskBand, (void **)&deskBand); + hResult = containedBand->QueryInterface(IID_IDeskBand, reinterpret_cast(&deskBand)); if (FAILED(hResult)) return hResult; fContainedBand = containedBand; @@ -168,7 +170,7 @@ fRebarWindow = hwnd; fBandID = bandID; fFlags = flags; - hResult = site->SetSite((IOleWindow *)this); + hResult = site->SetSite(static_cast(this)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&fChildWindow); @@ -192,15 +194,17 @@ CComPtr deskBand; HRESULT hResult; - hResult = fContainedBand->QueryInterface(IID_IDeskBand, (void **)&deskBand); + hResult = fContainedBand->QueryInterface(IID_IDeskBand, reinterpret_cast(&deskBand)); if (FAILED(hResult)) return hResult; - fDeskBandInfo.dwMask = DBIM_BKCOLOR | DBIM_MODEFLAGS | DBIM_TITLE | DBIM_ACTUAL | DBIM_INTEGRAL | DBIM_MAXSIZE | DBIM_MINSIZE; + fDeskBandInfo.dwMask = DBIM_BKCOLOR | DBIM_MODEFLAGS | DBIM_TITLE | DBIM_ACTUAL | + DBIM_INTEGRAL | DBIM_MAXSIZE | DBIM_MINSIZE; hResult = deskBand->GetBandInfo(fBandID, 0, &fDeskBandInfo); // result of call is ignored - bandInfo.fMask = RBBIM_LPARAM | RBBIM_IDEALSIZE | RBBIM_ID | RBBIM_CHILDSIZE | RBBIM_CHILD | RBBIM_TEXT | RBBIM_STYLE; + bandInfo.fMask = RBBIM_LPARAM | RBBIM_IDEALSIZE | RBBIM_ID | RBBIM_CHILDSIZE | RBBIM_CHILD | + RBBIM_TEXT | RBBIM_STYLE; bandInfo.fStyle = RBBS_FIXEDBMP; if (fDeskBandInfo.dwModeFlags & DBIMF_VARIABLEHEIGHT) @@ -211,11 +215,11 @@ bandInfo.fStyle |= RBBS_BREAK; if (fDeskBandInfo.dwModeFlags & DBIMF_TOPALIGN) bandInfo.fStyle |= RBBS_TOPALIGN; - if (fFlags & ITF_NOGRIPPER || fToolbar->fLocked == true) + if (fFlags & ITF_NOGRIPPER || fToolbar->fLocked) bandInfo.fStyle |= RBBS_NOGRIPPER; if (fFlags & ITF_NOTITLE) bandInfo.fStyle |= RBBS_HIDETITLE; - if (fFlags & ITF_GRIPPERALWAYS && fToolbar->fLocked == false) + if (fFlags & ITF_GRIPPERALWAYS && !fToolbar->fLocked) bandInfo.fStyle |= RBBS_GRIPPERALWAYS; if (fFlags & ITF_FIXEDSIZE) bandInfo.fStyle |= RBBS_FIXEDSIZE; @@ -235,7 +239,7 @@ bandInfo.cyMaxChild = fDeskBandInfo.ptMaxSize.y; bandInfo.cyIntegral = fDeskBandInfo.ptIntegral.y; bandInfo.cxIdeal = fDeskBandInfo.ptActual.x; - bandInfo.lParam = (LPARAM)this; + bandInfo.lParam = reinterpret_cast(this); return S_OK; } @@ -272,12 +276,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CDockSite::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CDockSite::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CDockSite::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CDockSite::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, + VARIANT *pvaIn, VARIANT *pvaOut) { TCHAR textBuffer[40]; REBARBANDINFOW bandInfo; @@ -319,8 +325,8 @@ if (IsEqualIID(guidService, SID_SMenuBandParent)) return this->QueryInterface(riid, ppvObject); - hResult = fToolbar->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fToolbar->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return hResult; return serviceProvider->QueryService(guidService, riid, ppvObject); } @@ -345,14 +351,18 @@ HKEY orderRegKey; DWORD disposition; HRESULT hResult; + static const TCHAR szFavoritesKey[] = + _T("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MenuOrder\\Favorites"); if (!IsEqualIID(riid, IID_IShellMenu)) return E_FAIL; if (psmd->uId != FCIDM_MENU_FAVORITES) return E_FAIL; + if (fFavoritesMenu.p == NULL) { - hResult = psmd->punk->QueryInterface(IID_IShellMenu, (void **)&parentMenu); + // create favorites menu + hResult = psmd->punk->QueryInterface(IID_IShellMenu, reinterpret_cast(&parentMenu)); if (FAILED(hResult)) return hResult; hResult = parentMenu->GetMenu(&parentHMenu, &ownerWindow, NULL); @@ -361,7 +371,8 @@ favoritesHMenu = GetSubMenu(parentHMenu, 3); if (favoritesHMenu == NULL) return E_FAIL; - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_IShellMenu, (void **)&newMenu); + hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, + IID_IShellMenu, reinterpret_cast(&newMenu)); if (FAILED(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -376,7 +387,7 @@ hResult = SHBindToFolder(favoritesPIDL, &favoritesFolder); if (FAILED(hResult)) return hResult; - RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MenuOrder\\Favorites"), + RegCreateKeyEx(HKEY_CURRENT_USER, szFavoritesKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &orderRegKey, &disposition); hResult = newMenu->SetShellFolder(favoritesFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | 0x18); ILFree(favoritesPIDL); @@ -400,26 +411,26 @@ break; case SMC_GETINFO: { - SMINFO *infoPtr = (SMINFO *)lParam; - if ((infoPtr->dwMask & SMIM_FLAGS) != 0) - { - if (psmd->uId == FCIDM_MENU_FAVORITES) + SMINFO *infoPtr = reinterpret_cast(lParam); + if ((infoPtr->dwMask & SMIM_FLAGS) != 0) { - infoPtr->dwFlags |= SMIF_DROPCASCADE; + if (psmd->uId == FCIDM_MENU_FAVORITES) + { + infoPtr->dwFlags |= SMIF_DROPCASCADE; + } + else + { + infoPtr->dwFlags |= SMIF_TRACKPOPUP; + } } - else - { - infoPtr->dwFlags |= SMIF_TRACKPOPUP; - } + if ((infoPtr->dwMask & SMIM_ICON) != 0) + infoPtr->iIcon = -1; } - if ((infoPtr->dwMask & SMIM_ICON) != 0) - infoPtr->iIcon = -1; - } return S_OK; case SMC_GETSFINFO: break; case SMC_GETOBJECT: - return GetObject(psmd, *(IID *)wParam, (void **)lParam); + return GetObject(psmd, *reinterpret_cast(wParam), reinterpret_cast(lParam)); case SMC_GETSFOBJECT: break; case SMC_SFEXEC: @@ -495,20 +506,20 @@ RECT neededBorderSpace; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IDockingWindowSite, (void **)&dockingWindowSite); + hResult = fSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast(&dockingWindowSite)); if (FAILED(hResult)) return hResult; - hResult = dockingWindowSite->GetBorderDW((IDockingWindow *)this, &availableBorderSpace); + hResult = dockingWindowSite->GetBorderDW(static_cast(this), &availableBorderSpace); if (FAILED(hResult)) return hResult; - SendMessage(fMainReBar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&availableBorderSpace); + SendMessage(fMainReBar, RB_SIZETORECT, RBSTR_CHANGERECT, reinterpret_cast(&availableBorderSpace)); neededBorderSpace.left = 0; neededBorderSpace.top = availableBorderSpace.bottom - availableBorderSpace.top; - if (fLocked == false) + if (!fLocked) neededBorderSpace.top += 3; neededBorderSpace.right = 0; neededBorderSpace.bottom = 0; - hResult = dockingWindowSite->SetBorderSpaceDW((IDockingWindow *)this, &neededBorderSpace); + hResult = dockingWindowSite->SetBorderSpaceDW(static_cast(this), &neededBorderSpace); if (FAILED(hResult)) return hResult; return S_OK; @@ -524,22 +535,23 @@ HWND ownerWindow; HRESULT hResult; - hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_IShellMenu, (void **)menuBar); + hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, + IID_IShellMenu, reinterpret_cast(menuBar)); if (FAILED(hResult)) return hResult; - hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, (void **)&callback); + hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast(&callback)); if (FAILED(hResult)) return hResult; hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = fSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); if (FAILED(hResult)) return hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, (void **)&siteCommandTarget); + hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&siteCommandTarget)); if (FAILED(hResult)) return hResult; hResult = siteCommandTarget->Exec(&CGID_Explorer, 0x35, 0, NULL, &menuOut); @@ -550,7 +562,7 @@ hResult = (*menuBar)->SetMenu((HMENU)V_INTREF(&menuOut), ownerWindow, SMSET_DONTOWN); if (FAILED(hResult)) return hResult; - hResult = (*menuBar)->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = (*menuBar)->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return hResult; hResult = commandTarget->Exec(&CGID_MenuBand, 3, 1, NULL, NULL); @@ -565,9 +577,10 @@ HRESULT hResult; #if 1 - hResult = ::CreateBrandBand(IID_IUnknown, (void **)logoBar); + hResult = ::CreateBrandBand(IID_IUnknown, reinterpret_cast(logoBar)); #else - hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)logoBar); + hResult = CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, + reinterpret_cast(logoBar)); #endif if (FAILED(hResult)) return hResult; @@ -578,7 +591,7 @@ { HRESULT hResult; - hResult = ::CreateToolsBar(IID_IUnknown, (void **)toolsBar); + hResult = ::CreateToolsBar(IID_IUnknown, reinterpret_cast(toolsBar)); if (FAILED(hResult)) return hResult; return S_OK; @@ -590,13 +603,14 @@ HRESULT hResult; #if 1 - hResult = ::CreateAddressBand(IID_IUnknown, (void **)toolsBar); + hResult = ::CreateAddressBand(IID_IUnknown, reinterpret_cast(toolsBar)); #else - hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)toolsBar); + hResult = CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, + reinterpret_cast(toolsBar)); #endif if (FAILED(hResult)) return hResult; - hResult = (*toolsBar)->QueryInterface(IID_IAddressBand, (void **)&addressBand); + hResult = (*toolsBar)->QueryInterface(IID_IAddressBand, reinterpret_cast(&addressBand)); return S_OK; } @@ -604,7 +618,6 @@ { REBARBANDINFOW rebarBandInfo; int bandCount; - int x; CDockSite *dockSite; HRESULT hResult; @@ -614,16 +627,16 @@ rebarBandInfo.cbSize = sizeof(rebarBandInfo); rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0); - for (x = 0; x < bandCount; x++) + for (INT x = 0; x < bandCount; x++) { SendMessage(fMainReBar, RB_GETBANDINFOW, x, (LPARAM)&rebarBandInfo); - dockSite = (CDockSite *)rebarBandInfo.lParam; + dockSite = reinterpret_cast(rebarBandInfo.lParam); if (dockSite != NULL) { rebarBandInfo.fStyle &= ~(RBBS_NOGRIPPER | RBBS_GRIPPERALWAYS); - if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || fLocked == true) + if (dockSite->fFlags & CDockSite::ITF_NOGRIPPER || fLocked) rebarBandInfo.fStyle |= RBBS_NOGRIPPER; - if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && fLocked == false) + if (dockSite->fFlags & CDockSite::ITF_GRIPPERALWAYS && !fLocked) rebarBandInfo.fStyle |= RBBS_GRIPPERALWAYS; SendMessage(fMainReBar, RB_SETBANDINFOW, x, (LPARAM)&rebarBandInfo); } @@ -664,17 +677,17 @@ CComPtr serviceProvider; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return hResult; - hResult = serviceProvider->QueryService(SID_IBandProxy, IID_IBandProxy, (void **)&fBandProxy); - if (FAILED (hResult)) + hResult = serviceProvider->QueryService(SID_IBandProxy, IID_IBandProxy, reinterpret_cast(&fBandProxy)); + if (FAILED(hResult)) { - hResult = CreateBandProxy(IID_IBandProxy, (void **)&fBandProxy); - if (FAILED (hResult)) + hResult = CreateBandProxy(IID_IBandProxy, reinterpret_cast(&fBandProxy)); + if (FAILED(hResult)) return hResult; hResult = fBandProxy->SetSite(fSite); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; } return S_OK; @@ -715,7 +728,7 @@ // show the bar here hResult = ReserveBorderSpace(); - hResult = fMenuBar->QueryInterface(IID_IDockingWindow, (void **)&dockingWindow); + hResult = fMenuBar->QueryInterface(IID_IDockingWindow, reinterpret_cast(&dockingWindow)); hResult = dockingWindow->ShowDW(fShow); return S_OK; } @@ -725,7 +738,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +HRESULT STDMETHODCALLTYPE CInternetToolbar::ResizeBorderDW(LPCRECT prcBorder, + IUnknown *punkToolbarSite, BOOL fReserved) { return E_NOTIMPL; } @@ -772,15 +786,18 @@ hResult = CreateMenuBar(&menuBar); if (FAILED(hResult)) return hResult; - AddDockItem(menuBar, ITBBID_MENUBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); - hResult = menuBar->QueryInterface(IID_IOleWindow, (void **)&menuOleWindow); + AddDockItem(menuBar, ITBBID_MENUBAND, + CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); + + hResult = menuBar->QueryInterface(IID_IOleWindow, reinterpret_cast(&menuOleWindow)); hResult = menuOleWindow->GetWindow(&fMenuBandWindow); fMenuBar.Attach(menuBar.Detach()); // transfer the ref count hResult = CreateBrandBand(&logoBar); if (FAILED(hResult)) return hResult; - AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); + AddDockItem(logoBar, ITBBID_BRANDBAND, + CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); fLogoBar.Attach(logoBar.Detach()); // transfer the ref count hResult = CreateToolsBar(&toolsBar); @@ -788,7 +805,7 @@ return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS); fControlsBar.Attach(toolsBar.Detach()); // transfer the ref count - hResult = fControlsBar->QueryInterface(IID_IOleWindow, (void **)&toolbarOleWindow); + hResult = fControlsBar->QueryInterface(IID_IOleWindow, reinterpret_cast(&toolbarOleWindow)); if (FAILED(hResult)) return hResult; hResult = toolbarOleWindow->GetWindow(&fToolbarWindow); @@ -799,14 +816,15 @@ if (FAILED(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS); - hResult = navigationBar->QueryInterface(IID_IOleWindow, (void **)&navigationOleWindow); + hResult = navigationBar->QueryInterface(IID_IOleWindow, reinterpret_cast(&navigationOleWindow)); hResult = navigationOleWindow->GetWindow(&fNavigationWindow); fNavigationBar.Attach(navigationBar.Detach()); return S_OK; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryStatus(const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { if (IsEqualIID(*pguidCmdGroup, CGID_PrivCITCommands)) { @@ -852,7 +870,8 @@ return E_FAIL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CInternetToolbar::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { if (IsEqualIID(*pguidCmdGroup, CGID_PrivCITCommands)) { @@ -893,12 +912,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT STDMETHODCALLTYPE CInternetToolbar::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +HRESULT STDMETHODCALLTYPE CInternetToolbar::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HRESULT hResult; @@ -915,8 +936,8 @@ return E_INVALIDARG; if (V_VT(&pDispParams->rgvarg[0]) != VT_BOOL || V_VT(&pDispParams->rgvarg[1]) != VT_I4) return E_INVALIDARG; - return CommandStateChanged(V_BOOL(&pDispParams->rgvarg[0]) == VARIANT_FALSE ? false : true, - V_I4(&pDispParams->rgvarg[1])); + return CommandStateChanged(V_BOOL(&pDispParams->rgvarg[0]) != VARIANT_FALSE, + V_I4(&pDispParams->rgvarg[1])); case DISPID_DOWNLOADBEGIN: hResult = S_OK; break; @@ -935,7 +956,7 @@ HRESULT hResult; fCommandTarget.Release(); - hResult = theTarget->QueryInterface(IID_IOleCommandTarget, (void **)&fCommandTarget); + hResult = theTarget->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&fCommandTarget)); if (FAILED(hResult)) return hResult; fCommandCategory = *category; @@ -952,11 +973,13 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::AddString(const GUID *pguidCmdGroup, HINSTANCE param10, LPCTSTR param14, long *param18) +HRESULT STDMETHODCALLTYPE CInternetToolbar::AddString(const GUID *pguidCmdGroup, + HINSTANCE param10, LPCTSTR param14, long *param18) { long result; - result = (long)::SendMessage(fToolbarWindow, TB_ADDSTRINGW, (WPARAM)param10, (LPARAM)param14); + result = (long)::SendMessage(fToolbarWindow, TB_ADDSTRINGW, + reinterpret_cast(param10), reinterpret_cast(param14)); *param18 = result; if (result == -1) return E_FAIL; @@ -984,7 +1007,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::AddBitmap(const GUID *pguidCmdGroup, long param10, long buttonCount, TBADDBITMAP *lParam, long *newIndex, COLORREF param20) +HRESULT STDMETHODCALLTYPE CInternetToolbar::AddBitmap(const GUID *pguidCmdGroup, long param10, long buttonCount, + TBADDBITMAP *lParam, long *newIndex, COLORREF param20) { return E_NOTIMPL; } @@ -997,12 +1021,14 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::SendToolbarMsg(const GUID *pguidCmdGroup, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *result) +HRESULT STDMETHODCALLTYPE CInternetToolbar::SendToolbarMsg(const GUID *pguidCmdGroup, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *result) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::SetImageList(const GUID *pguidCmdGroup, HIMAGELIST param10, HIMAGELIST param14, HIMAGELIST param18) +HRESULT STDMETHODCALLTYPE CInternetToolbar::SetImageList(const GUID *pguidCmdGroup, HIMAGELIST param10, + HIMAGELIST param14, HIMAGELIST param18) { return E_NOTIMPL; } @@ -1025,6 +1051,7 @@ HWND ownerWindow; HWND dockContainer; HRESULT hResult; + DWORD style; if (pUnkSite == NULL) { @@ -1035,7 +1062,8 @@ } else { - hResult = pUnkSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + // get window handle of owner + hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (FAILED(hResult)) return hResult; hResult = oleWindow->GetWindow(&ownerWindow); @@ -1043,19 +1071,28 @@ return hResult; if (ownerWindow == NULL) return E_FAIL; + + // create dock container fSite = pUnkSite; - dockContainer = SHCreateWorkerWindowW(0, ownerWindow, 0, WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, NULL, 0); + dockContainer = SHCreateWorkerWindowW(0, ownerWindow, 0, + WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, NULL, 0); if (dockContainer == NULL) return E_FAIL; SubclassWindow(dockContainer); - fMainReBar = CreateWindow(REBARCLASSNAMEW, _T(""), WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | - RBS_BANDBORDERS | RBS_REGISTERDROP | RBS_AUTOSIZE | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_TOP, + + // create rebar in dock container + style = WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | RBS_VARHEIGHT | + RBS_BANDBORDERS | RBS_REGISTERDROP | RBS_AUTOSIZE | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_TOP; + fMainReBar = CreateWindow(REBARCLASSNAMEW, NULL, style, 0, 0, 700, 60, dockContainer, NULL, _AtlBaseModule.GetModuleInstance(), NULL); if (fMainReBar == NULL) return E_FAIL; - hResult = pUnkSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, (void **)&browserService); - hResult = AtlAdvise(browserService, (IDispatch *)this, DIID_DWebBrowserEvents, &fAdviseCookie); + + // take advice to watch events + hResult = pUnkSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + hResult = serviceProvider->QueryService( + SID_SShellBrowser, IID_IBrowserService, reinterpret_cast(&browserService)); + hResult = AtlAdvise(browserService, static_cast(this), DIID_DWebBrowserEvents, &fAdviseCookie); } return S_OK; } @@ -1082,25 +1119,26 @@ if (fBandProxy.p == NULL) { hResult = CreateAndInitBandProxy(); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; } return fBandProxy->QueryInterface(riid, ppvObject); } - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return hResult; return serviceProvider->QueryService(guidService, riid, ppvObject); } -HRESULT STDMETHODCALLTYPE CInternetToolbar::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +HRESULT STDMETHODCALLTYPE CInternetToolbar::OnWinEvent( + HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { CComPtr menuWinEventHandler; HRESULT hResult; if (fMenuBar.p != NULL) { - hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, (void **)&menuWinEventHandler); + hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&menuWinEventHandler)); return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); } return E_FAIL; @@ -1121,14 +1159,15 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) +HRESULT STDMETHODCALLTYPE CInternetToolbar::QueryBand(DWORD dwBandID, + IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { if (ppstb == NULL) return E_POINTER; if (dwBandID == ITBBID_MENUBAND && fMenuBar.p != NULL) - return fMenuBar->QueryInterface(IID_IDeskBand, (void **)ppstb); + return fMenuBar->QueryInterface(IID_IDeskBand, reinterpret_cast(ppstb)); if (dwBandID == ITBBID_BRANDBAND && fLogoBar.p != NULL) - return fLogoBar->QueryInterface(IID_IDeskBand, (void **)ppstb); + return fLogoBar->QueryInterface(IID_IDeskBand, reinterpret_cast(ppstb)); *ppstb = NULL; return E_FAIL; } @@ -1164,11 +1203,12 @@ CComPtr webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return 0; - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IWebBrowser, (void **)&webBrowser); - if (FAILED (hResult)) + hResult = serviceProvider->QueryService(SID_SShellBrowser, + IID_IWebBrowser, reinterpret_cast(&webBrowser)); + if (FAILED(hResult)) return 0; hResult = webBrowser->GoBack(); return 1; @@ -1180,11 +1220,12 @@ CComPtr webBrowser; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + if (FAILED(hResult)) return 0; - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IWebBrowser, (void **)&webBrowser); - if (FAILED (hResult)) + hResult = serviceProvider->QueryService( + SID_SShellBrowser, IID_IWebBrowser, reinterpret_cast(&webBrowser)); + if (FAILED(hResult)) return 0; hResult = webBrowser->GoForward(); return 1; @@ -1195,8 +1236,8 @@ CComPtr oleCommandTarget; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); + if (FAILED(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_ShellBrowser, IDM_GOTO_UPONELEVEL, 0, NULL, NULL); return 1; @@ -1218,14 +1259,15 @@ commandInfo.lpParameters = searchGUID; commandInfo.nShow = SW_SHOWNORMAL; - hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, IID_IContextMenu, (void **)&contextMenu); - if (FAILED (hResult)) + hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, + IID_IContextMenu, reinterpret_cast(&contextMenu)); + if (FAILED(hResult)) return 0; - hResult = contextMenu->QueryInterface(IID_IObjectWithSite, (void **)&objectWithSite); - if (FAILED (hResult)) + hResult = contextMenu->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&objectWithSite)); + if (FAILED(hResult)) return 0; hResult = objectWithSite->SetSite(fSite); - if (FAILED (hResult)) + if (FAILED(hResult)) return 0; hResult = contextMenu->InvokeCommand(&commandInfo); hResult = objectWithSite->SetSite(NULL); @@ -1237,8 +1279,8 @@ CComPtr oleCommandTarget; HRESULT hResult; - hResult = fSite->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); - if (FAILED (hResult)) + hResult = fSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); + if (FAILED(hResult)) return hResult; hResult = oleCommandTarget->Exec(&CGID_Explorer, 0x23, 0, NULL, NULL); return 1; @@ -1277,20 +1319,22 @@ bHandled = FALSE; return 0; } - SendMessage(fToolbarWindow, TB_GETRECT, notifyInfo->iItem, (LPARAM)&bounds); - ::MapWindowPoints(fToolbarWindow, NULL, (POINT *)&bounds, 2); + SendMessage(fToolbarWindow, TB_GETRECT, notifyInfo->iItem, reinterpret_cast(&bounds)); + ::MapWindowPoints(fToolbarWindow, NULL, reinterpret_cast(&bounds), 2); switch (notifyInfo->iItem) { case gBackCommandID: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, (void **)&browserService); + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + hResult = serviceProvider->QueryService( + SID_SShellBrowser, IID_IBrowserService, reinterpret_cast(&browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_BACK); - hResult = browserService->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = browserService->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); commandInfo.cmdID = 0x1d; hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); - if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) + if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && + travelLog->CountEntries(browserService) > 1) { AppendMenu(newMenu, MF_SEPARATOR, -1, L""); AppendMenu(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, L"&History\tCtrl+H"); @@ -1311,14 +1355,16 @@ break; case gForwardCommandID: newMenu = CreatePopupMenu(); - hResult = fSite->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, (void **)&browserService); + hResult = fSite->QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + hResult = serviceProvider->QueryService(SID_SShellBrowser, IID_IBrowserService, + reinterpret_cast(&browserService)); hResult = browserService->GetTravelLog(&travelLog); hResult = travelLog->InsertMenuEntries(browserService, newMenu, 0, 1, 9, TLMENUF_FORE); - hResult = browserService->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = browserService->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); commandInfo.cmdID = 0x1d; hResult = commandTarget->QueryStatus(&CGID_Explorer, 1, &commandInfo, NULL); - if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && travelLog->CountEntries(browserService) > 1) + if ((commandInfo.cmdf & (OLECMDF_ENABLED | OLECMDF_LATCHED)) == OLECMDF_ENABLED && + travelLog->CountEntries(browserService) > 1) { AppendMenu(newMenu, MF_SEPARATOR, -1, L""); AppendMenu(newMenu, MF_STRING /* | MF_OWNERDRAW */, IDM_EXPLORERBAR_HISTORY, L"&History\tCtrl+H"); @@ -1343,7 +1389,7 @@ HRESULT hResult; V_VT(&inValue) = VT_INT_PTR; - V_INTREF(&inValue) = (INT *)&bounds; + V_INTREF(&inValue) = reinterpret_cast(&bounds); if (fCommandTarget.p != NULL) hResult = fCommandTarget->Exec(&fCommandCategory, 0x7031, 1, &inValue, &outValue); @@ -1369,7 +1415,7 @@ LRESULT theResult; HRESULT hResult; - hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); + hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); hResult = winEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult); if (SUCCEEDED(hResult)) return theResult; @@ -1448,7 +1494,8 @@ { if (wParam != SIZE_MINIMIZED) { - ::SetWindowPos(fMainReBar, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); + ::SetWindowPos(fMainReBar, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), + SWP_NOOWNERZORDER | SWP_NOZORDER | SWP_NOMOVE); } return 1; } @@ -1473,7 +1520,7 @@ wchar_t tempString[300]; HRESULT hResult; - pTTTW = (TOOLTIPTEXTW *)pNMHDR; + pTTTW = reinterpret_cast(pNMHDR); if ((pTTTW->uFlags & TTF_IDISHWND) != 0) nID = ::GetDlgCtrlID((HWND)pNMHDR->idFrom); else @@ -1484,10 +1531,11 @@ if (nID == (UINT)gBackCommandID || nID == (UINT)gForwardCommandID) { // TODO: Should this call QueryService? - hResult = fSite->QueryInterface(IID_IBrowserService, (void **)&browserService); + hResult = fSite->QueryInterface(IID_IBrowserService, reinterpret_cast(&browserService)); hResult = browserService->GetTravelLog(&travelLog); - hResult = travelLog->GetToolTipText(browserService, nID == (UINT)gBackCommandID ? TLOG_BACK : TLOG_FORE, - 0, tempString, 299); + hResult = travelLog->GetToolTipText(browserService, + (nID == (UINT)gBackCommandID) ? TLOG_BACK : TLOG_FORE, + 0, tempString, 299); if (FAILED(hResult)) { bHandled = FALSE; @@ -1497,7 +1545,8 @@ else tempString[0] = 0; wcsncpy (pTTTW->szText, tempString, sizeof (pTTTW->szText) / sizeof (wchar_t)); - ::SetWindowPos (pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); + ::SetWindowPos(pNMHDR->hwndFrom, HWND_TOP, 0, 0, 0, 0, + SWP_NOOWNERZORDER | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); return 0; } return 0; @@ -1513,13 +1562,14 @@ notifyHeader = (NMHDR *)lParam; if (fMenuBar.p != NULL && notifyHeader->hwndFrom == fMenuBandWindow) { - hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, (void **)&menuWinEventHandler); + hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&menuWinEventHandler)); hResult = menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, &theResult); return theResult; } if (fNavigationBar.p != NULL && notifyHeader->hwndFrom == fNavigationWindow) { - hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, (void **)&menuWinEventHandler); + hResult = fNavigationBar->QueryInterface( + IID_IWinEventHandler, reinterpret_cast(&menuWinEventHandler)); hResult = menuWinEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult); return theResult; } @@ -1537,8 +1587,8 @@ ATLTRY (theToolbar = new CComObject); if (theToolbar == NULL) return E_OUTOFMEMORY; - hResult = theToolbar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theToolbar->QueryInterface (riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theToolbar; return hResult; Index: dll/win32/browseui/internettoolbar.h =================================================================== --- dll/win32/browseui/internettoolbar.h (revision 58787) +++ dll/win32/browseui/internettoolbar.h (working copy) @@ -198,43 +198,43 @@ LRESULT OnTipText(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled); LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -BEGIN_MSG_MAP(CInternetToolbar) - COMMAND_ID_HANDLER(gBackCommandID, OnTravelBack) - COMMAND_ID_HANDLER(gForwardCommandID, OnTravelForward) - COMMAND_ID_HANDLER(gUpLevelCommandID, OnUpLevel) - COMMAND_ID_HANDLER(gSearchCommandID, OnSearch) - COMMAND_ID_HANDLER(gFoldersCommandID, OnFolders) - COMMAND_RANGE_HANDLER(0x7000, 0x7fff, OnForwardToCommandTarget) - NOTIFY_HANDLER(0, TBN_DROPDOWN, OnMenuDropDown) - NOTIFY_HANDLER(0, TBN_QUERYINSERT, OnQueryInsert) - NOTIFY_HANDLER(0, TBN_QUERYDELETE, OnQueryDelete) - MESSAGE_HANDLER(WM_COMMAND, OnNavigateCommand) - MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) - NOTIFY_CODE_HANDLER(TTN_NEEDTEXTW, OnTipText) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) -END_MSG_MAP() + BEGIN_MSG_MAP(CInternetToolbar) + COMMAND_ID_HANDLER(gBackCommandID, OnTravelBack) + COMMAND_ID_HANDLER(gForwardCommandID, OnTravelForward) + COMMAND_ID_HANDLER(gUpLevelCommandID, OnUpLevel) + COMMAND_ID_HANDLER(gSearchCommandID, OnSearch) + COMMAND_ID_HANDLER(gFoldersCommandID, OnFolders) + COMMAND_RANGE_HANDLER(0x7000, 0x7fff, OnForwardToCommandTarget) + NOTIFY_HANDLER(0, TBN_DROPDOWN, OnMenuDropDown) + NOTIFY_HANDLER(0, TBN_QUERYINSERT, OnQueryInsert) + NOTIFY_HANDLER(0, TBN_QUERYDELETE, OnQueryDelete) + MESSAGE_HANDLER(WM_COMMAND, OnNavigateCommand) + MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) + NOTIFY_CODE_HANDLER(TTN_NEEDTEXTW, OnTipText) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + END_MSG_MAP() -DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) -DECLARE_NOT_AGGREGATABLE(CInternetToolbar) + DECLARE_REGISTRY_RESOURCEID(IDR_INTERNETTOOLBAR) + DECLARE_NOT_AGGREGATABLE(CInternetToolbar) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CInternetToolbar) - COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) - COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) -// COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IPersistStreamInit, IPersistStreamInit) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IExplorerToolbar, IExplorerToolbar) - COM_INTERFACE_ENTRY_IID(IID_IShellChangeNotify, IShellChangeNotify) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) - COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) -END_COM_MAP() + BEGIN_COM_MAP(CInternetToolbar) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + // COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersistStreamInit, IPersistStreamInit) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IExplorerToolbar, IExplorerToolbar) + COM_INTERFACE_ENTRY_IID(IID_IShellChangeNotify, IShellChangeNotify) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) + END_COM_MAP() }; Index: dll/win32/browseui/newatlinterfaces.h =================================================================== --- dll/win32/browseui/newatlinterfaces.h (revision 58787) +++ dll/win32/browseui/newatlinterfaces.h (working copy) @@ -64,7 +64,7 @@ *pdwCookie = 0; if (pUnkSink == NULL || pdwCookie == NULL) return E_POINTER; - hResult = pUnkSink->QueryInterface(IID_IDispatch, (void **)&adviseSink); + hResult = pUnkSink->QueryInterface(IID_IDispatch, reinterpret_cast(&adviseSink)); if (FAILED(hResult)) { if (hResult == E_NOINTERFACE) Index: dll/win32/browseui/regtreeoptions.h =================================================================== --- dll/win32/browseui/regtreeoptions.h (revision 58787) +++ dll/win32/browseui/regtreeoptions.h (working copy) @@ -41,13 +41,13 @@ virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, void **ppvSite); -DECLARE_REGISTRY_RESOURCEID(IDR_REGTREEOPTIONS) -DECLARE_NOT_AGGREGATABLE(CRegTreeOptions) + DECLARE_REGISTRY_RESOURCEID(IDR_REGTREEOPTIONS) + DECLARE_NOT_AGGREGATABLE(CRegTreeOptions) -DECLARE_PROTECT_FINAL_CONSTRUCT() + DECLARE_PROTECT_FINAL_CONSTRUCT() -BEGIN_COM_MAP(CRegTreeOptions) - COM_INTERFACE_ENTRY_IID(IID_IRegTreeOptions, IRegTreeOptions) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) -END_COM_MAP() + BEGIN_COM_MAP(CRegTreeOptions) + COM_INTERFACE_ENTRY_IID(IID_IRegTreeOptions, IRegTreeOptions) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + END_COM_MAP() }; Index: dll/win32/browseui/shellbrowser.cpp =================================================================== --- dll/win32/browseui/shellbrowser.cpp (revision 58787) +++ dll/win32/browseui/shellbrowser.cpp (working copy) @@ -137,30 +137,13 @@ // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); - -#ifdef SetWindowLongPtr -#undef SetWindowLongPtr -inline LONG_PTR SetWindowLongPtr(HWND hWnd, int nIndex, LONG_PTR dwNewLong) -{ - return SetWindowLong(hWnd, nIndex, (LONG)dwNewLong); -} -#endif - -#ifdef GetWindowLongPtr -#undef GetWindowLongPtr -inline LONG_PTR GetWindowLongPtr(HWND hWnd, int nIndex) -{ - return (LONG_PTR)GetWindowLong(hWnd, nIndex); -} -#endif - HMENU SHGetMenuFromID(HMENU topMenu, int theID) { MENUITEMINFO menuItemInfo; menuItemInfo.cbSize = sizeof(menuItemInfo); menuItemInfo.fMask = MIIM_SUBMENU; - if (GetMenuItemInfo(topMenu, theID, FALSE, &menuItemInfo) == FALSE) + if (!GetMenuItemInfo(topMenu, theID, FALSE, &menuItemInfo)) return NULL; return menuItemInfo.hSubMenu; } @@ -193,7 +176,8 @@ { menuItemInfo.cbSize = sizeof(menuItemInfo); menuItemInfo.fMask = MIIM_ID; - if (GetMenuItemInfo(theMenu, curIndex, TRUE, &menuItemInfo) && menuItemInfo.wID >= firstIDToDelete && menuItemInfo.wID <= lastIDToDelete) + if (GetMenuItemInfo(theMenu, curIndex, TRUE, &menuItemInfo) && + menuItemInfo.wID >= firstIDToDelete && menuItemInfo.wID <= lastIDToDelete) { DeleteMenu(theMenu, curIndex, MF_BYPOSITION); menuItemCount--; @@ -216,7 +200,7 @@ desktop.p->AddRef (); return S_OK; } - return desktop->BindToObject (path, NULL, IID_IShellFolder, (void **)newFolder); + return desktop->BindToObject (path, NULL, IID_IShellFolder, reinterpret_cast(newFolder)); } static const TCHAR szCabinetWndClass[] = TEXT("CabinetWClassX"); @@ -239,10 +223,10 @@ LRESULT OnAddBitmap(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnForwardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); -BEGIN_MSG_MAP(CToolbarProxy) - MESSAGE_HANDLER(TB_ADDBITMAP, OnAddBitmap) - MESSAGE_RANGE_HANDLER(WM_USER, 0x7fff, OnForwardMessage) -END_MSG_MAP() + BEGIN_MSG_MAP(CToolbarProxy) + MESSAGE_HANDLER(TB_ADDBITMAP, OnAddBitmap) + MESSAGE_RANGE_HANDLER(WM_USER, 0x7fff, OnForwardMessage) + END_MSG_MAP() }; void CToolbarProxy::Initialize(HWND parent, IUnknown *explorerToolbar) @@ -255,7 +239,8 @@ { SubclassWindow(myWindow); SetWindowPos(NULL, -32000, -32000, 0, 0, SWP_NOOWNERZORDER | SWP_NOZORDER); - hResult = explorerToolbar->QueryInterface(IID_IExplorerToolbar, (void **)&fExplorerToolbar); + hResult = explorerToolbar->QueryInterface( + IID_IExplorerToolbar, reinterpret_cast(&fExplorerToolbar)); } } @@ -267,8 +252,10 @@ result = 0; if (fExplorerToolbar.p != NULL) { - hResult = fExplorerToolbar->AddBitmap(&CGID_ShellBrowser, 1, (long)wParam, (TBADDBITMAP *)lParam, &result, RGB(192, 192, 192)); - hResult = fExplorerToolbar->AddBitmap(&CGID_ShellBrowser, 2, (long)wParam, (TBADDBITMAP *)lParam, &result, RGB(192, 192, 192)); + hResult = fExplorerToolbar->AddBitmap(&CGID_ShellBrowser, 1, (long)wParam, + reinterpret_cast(lParam), &result, RGB(192, 192, 192)); + hResult = fExplorerToolbar->AddBitmap(&CGID_ShellBrowser, 2, (long)wParam, + reinterpret_cast(lParam), &result, RGB(192, 192, 192)); } return result; } @@ -331,7 +318,8 @@ CComPtr fTravelLog; HMENU fCurrentMenuBar; CABINETSTATE fCabinetState; - // The next three fields support persisted history for shell views. They do not need to be reference counted. + // The next three fields support persisted history for shell views. + // They do not need to be reference counted. IOleObject *fHistoryObject; IStream *fHistoryStream; IBindCtx *fHistoryBindContext; @@ -354,7 +342,8 @@ HRESULT Initialize(LPITEMIDLIST pidl, long b, long c, long d); public: HRESULT BrowseToPIDL(LPCITEMIDLIST pidl, long flags); - HRESULT BrowseToPath(IShellFolder *newShellFolder, LPITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags); + HRESULT BrowseToPath(IShellFolder *newShellFolder, LPITEMIDLIST absolutePIDL, + FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); HRESULT GetBaseBar(bool vertical, IUnknown **theBaseBar); HRESULT ShowBand(const CLSID &classID, bool vertical); @@ -386,8 +375,10 @@ virtual HRESULT STDMETHODCALLTYPE SetBorderSpaceDW(IUnknown* punkObj, LPCBORDERWIDTHS pbw); // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, + OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); // *** IOleWindow methods *** virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *lphwnd); @@ -404,8 +395,8 @@ virtual HRESULT STDMETHODCALLTYPE GetViewStateStream(DWORD grfMode, IStream **ppStrm); virtual HRESULT STDMETHODCALLTYPE GetControlWindow(UINT id, HWND *lphwnd); virtual HRESULT STDMETHODCALLTYPE SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret); - virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(struct IShellView **ppshv); - virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(struct IShellView *ppshv); + virtual HRESULT STDMETHODCALLTYPE QueryActiveShellView(IShellView **ppshv); + virtual HRESULT STDMETHODCALLTYPE OnViewWindowActive(IShellView *ppshv); virtual HRESULT STDMETHODCALLTYPE SetToolbarItems(LPTBBUTTON lpButtons, UINT nButtons, UINT uFlags); // *** IDropTarget methods *** @@ -423,8 +414,10 @@ // *** IDispatch methods *** virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); + virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames( + REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); + virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); // *** IBrowserService methods *** virtual HRESULT STDMETHODCALLTYPE GetParentSite(IOleInPlaceSite **ppipsite); @@ -493,8 +486,10 @@ virtual HRESULT STDMETHODCALLTYPE _NavigateToPidl(LPCITEMIDLIST pidl, DWORD grfHLNF, DWORD dwFlags); virtual HRESULT STDMETHODCALLTYPE _TryShell2Rename(IShellView *psv, LPCITEMIDLIST pidlNew); virtual HRESULT STDMETHODCALLTYPE _SwitchActivationNow(); - virtual HRESULT STDMETHODCALLTYPE _ExecChildren(IUnknown *punkBar, BOOL fBroadcast, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut); - virtual HRESULT STDMETHODCALLTYPE _SendChildren(HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam); + virtual HRESULT STDMETHODCALLTYPE _ExecChildren(IUnknown *punkBar, BOOL fBroadcast, const GUID *pguidCmdGroup, + DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut); + virtual HRESULT STDMETHODCALLTYPE _SendChildren( + HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam); virtual HRESULT STDMETHODCALLTYPE GetFolderSetData(struct tagFolderSetData *pfsd); virtual HRESULT STDMETHODCALLTYPE _OnFocusChange(UINT itb); virtual HRESULT STDMETHODCALLTYPE v_ShowHideChildWindows(BOOL fChildOnly); @@ -514,7 +509,8 @@ virtual HRESULT STDMETHODCALLTYPE _SaveToolbars(IStream *pstm); virtual HRESULT STDMETHODCALLTYPE _LoadToolbars(IStream *pstm); virtual HRESULT STDMETHODCALLTYPE _CloseAndReleaseToolbars(BOOL fClose); - virtual HRESULT STDMETHODCALLTYPE v_MayGetNextToolbarFocus(LPMSG lpMsg, UINT itbNext, int citb, LPTOOLBARITEM *pptbi, HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE v_MayGetNextToolbarFocus(LPMSG lpMsg, UINT itbNext, + int citb, LPTOOLBARITEM *pptbi, HWND *phwnd); virtual HRESULT STDMETHODCALLTYPE _ResizeNextBorderHelper(UINT itb, BOOL bUseHmonitor); virtual UINT STDMETHODCALLTYPE _FindTBar(IUnknown *punkSrc); virtual HRESULT STDMETHODCALLTYPE _SetFocus(LPTOOLBARITEM ptbi, HWND hwnd, LPMSG lpMsg); @@ -527,7 +523,8 @@ virtual HRESULT STDMETHODCALLTYPE GoForward(); virtual HRESULT STDMETHODCALLTYPE GoHome(); virtual HRESULT STDMETHODCALLTYPE GoSearch(); - virtual HRESULT STDMETHODCALLTYPE Navigate(BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers); + virtual HRESULT STDMETHODCALLTYPE Navigate(BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, + VARIANT *PostData, VARIANT *Headers); virtual HRESULT STDMETHODCALLTYPE Refresh(); virtual HRESULT STDMETHODCALLTYPE Refresh2(VARIANT *Level); virtual HRESULT STDMETHODCALLTYPE Stop(); @@ -582,9 +579,11 @@ virtual HRESULT STDMETHODCALLTYPE put_FullScreen(VARIANT_BOOL bFullScreen); // *** IWebBrowser2 methods *** - virtual HRESULT STDMETHODCALLTYPE Navigate2(VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers); + virtual HRESULT STDMETHODCALLTYPE Navigate2(VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, + VARIANT *PostData, VARIANT *Headers); virtual HRESULT STDMETHODCALLTYPE QueryStatusWB(OLECMDID cmdID, OLECMDF *pcmdf); - virtual HRESULT STDMETHODCALLTYPE ExecWB(OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + virtual HRESULT STDMETHODCALLTYPE ExecWB(OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, + VARIANT *pvaIn, VARIANT *pvaOut); virtual HRESULT STDMETHODCALLTYPE ShowBrowserBar(VARIANT *pvaClsid, VARIANT *pvarShow, VARIANT *pvarSize); virtual HRESULT STDMETHODCALLTYPE get_ReadyState(READYSTATE *plReadyState); virtual HRESULT STDMETHODCALLTYPE get_Offline(VARIANT_BOOL *pbOffline); @@ -656,72 +655,70 @@ return wc; } -BEGIN_MSG_MAP(CShellBrowser) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) - MESSAGE_HANDLER(WM_MEASUREITEM, RelayMsgToShellView) - MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) - MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) - COMMAND_ID_HANDLER(IDM_FILE_CLOSE, OnClose) - COMMAND_ID_HANDLER(IDM_TOOLS_FOLDEROPTIONS, OnFolderOptions) - COMMAND_ID_HANDLER(IDM_TOOLS_MAPNETWORKDRIVE, OnMapNetworkDrive) - COMMAND_ID_HANDLER(IDM_TOOLS_DISCONNECTNETWORKDRIVE, OnDisconnectNetworkDrive) - COMMAND_ID_HANDLER(IDM_HELP_ABOUT, OnAboutReactOS) - COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnGoBack) - COMMAND_ID_HANDLER(IDM_GOTO_FORWARD, OnGoForward) - COMMAND_ID_HANDLER(IDM_GOTO_UPONELEVEL, OnGoUpLevel) - COMMAND_ID_HANDLER(IDM_GOTO_HOMEPAGE, OnGoHome) - COMMAND_ID_HANDLER(IDM_HELP_ISTHISCOPYLEGAL, OnIsThisLegal) - COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible) - COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock) - COMMAND_ID_HANDLER(IDM_TOOLBARS_STANDARDBUTTONS, OnToggleToolbarBandVisible) - COMMAND_ID_HANDLER(IDM_TOOLBARS_ADDRESSBAR, OnToggleAddressBandVisible) - COMMAND_ID_HANDLER(IDM_TOOLBARS_LINKSBAR, OnToggleLinksBandVisible) - COMMAND_ID_HANDLER(IDM_TOOLBARS_TEXTLABELS, OnToggleTextLabels) - COMMAND_ID_HANDLER(IDM_TOOLBARS_CUSTOMIZE, OnToolbarCustomize) - COMMAND_RANGE_HANDLER(IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, OnGoTravel) - MESSAGE_HANDLER(WM_COMMAND, RelayCommands) -END_MSG_MAP() + BEGIN_MSG_MAP(CShellBrowser) + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) + MESSAGE_HANDLER(WM_MEASUREITEM, RelayMsgToShellView) + MESSAGE_HANDLER(WM_DRAWITEM, RelayMsgToShellView) + MESSAGE_HANDLER(WM_MENUSELECT, RelayMsgToShellView) + COMMAND_ID_HANDLER(IDM_FILE_CLOSE, OnClose) + COMMAND_ID_HANDLER(IDM_TOOLS_FOLDEROPTIONS, OnFolderOptions) + COMMAND_ID_HANDLER(IDM_TOOLS_MAPNETWORKDRIVE, OnMapNetworkDrive) + COMMAND_ID_HANDLER(IDM_TOOLS_DISCONNECTNETWORKDRIVE, OnDisconnectNetworkDrive) + COMMAND_ID_HANDLER(IDM_HELP_ABOUT, OnAboutReactOS) + COMMAND_ID_HANDLER(IDM_GOTO_BACK, OnGoBack) + COMMAND_ID_HANDLER(IDM_GOTO_FORWARD, OnGoForward) + COMMAND_ID_HANDLER(IDM_GOTO_UPONELEVEL, OnGoUpLevel) + COMMAND_ID_HANDLER(IDM_GOTO_HOMEPAGE, OnGoHome) + COMMAND_ID_HANDLER(IDM_HELP_ISTHISCOPYLEGAL, OnIsThisLegal) + COMMAND_ID_HANDLER(IDM_VIEW_STATUSBAR, OnToggleStatusBarVisible) + COMMAND_ID_HANDLER(IDM_TOOLBARS_LOCKTOOLBARS, OnToggleToolbarLock) + COMMAND_ID_HANDLER(IDM_TOOLBARS_STANDARDBUTTONS, OnToggleToolbarBandVisible) + COMMAND_ID_HANDLER(IDM_TOOLBARS_ADDRESSBAR, OnToggleAddressBandVisible) + COMMAND_ID_HANDLER(IDM_TOOLBARS_LINKSBAR, OnToggleLinksBandVisible) + COMMAND_ID_HANDLER(IDM_TOOLBARS_TEXTLABELS, OnToggleTextLabels) + COMMAND_ID_HANDLER(IDM_TOOLBARS_CUSTOMIZE, OnToolbarCustomize) + COMMAND_RANGE_HANDLER(IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, OnGoTravel) + MESSAGE_HANDLER(WM_COMMAND, RelayCommands) + END_MSG_MAP() -BEGIN_CONNECTION_POINT_MAP(CShellBrowser) - CONNECTION_POINT_ENTRY(DIID_DWebBrowserEvents2) - CONNECTION_POINT_ENTRY(DIID_DWebBrowserEvents) -END_CONNECTION_POINT_MAP() + BEGIN_CONNECTION_POINT_MAP(CShellBrowser) + CONNECTION_POINT_ENTRY(DIID_DWebBrowserEvents2) + CONNECTION_POINT_ENTRY(DIID_DWebBrowserEvents) + END_CONNECTION_POINT_MAP() -BEGIN_COM_MAP(CShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_IDockingWindowSite, IDockingWindowSite) - COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) - COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDockingWindowSite) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) - COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) - COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) - COM_INTERFACE_ENTRY_IID(IID_IProfferService, IProfferService) - COM_INTERFACE_ENTRY_IID(IID_IShellBrowserService, IShellBrowserService) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) - COM_INTERFACE_ENTRY_IID(IID_IConnectionPointContainer, IConnectionPointContainer) - COM_INTERFACE_ENTRY_IID(IID_IWebBrowser, IWebBrowser) - COM_INTERFACE_ENTRY_IID(IID_IWebBrowserApp, IWebBrowserApp) - COM_INTERFACE_ENTRY_IID(IID_IWebBrowser2, IWebBrowser2) - COM_INTERFACE_ENTRY_IID(IID_ITravelLogClient, ITravelLogClient) - COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) - COM_INTERFACE_ENTRY_IID(IID_IPersistHistory, IPersistHistory) - COM_INTERFACE_ENTRY_IID(IID_IBrowserService, IBrowserService) - COM_INTERFACE_ENTRY_IID(IID_IBrowserService2, IBrowserService2) -END_COM_MAP() + BEGIN_COM_MAP(CShellBrowser) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindowSite, IDockingWindowSite) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY2_IID(IID_IOleWindow, IOleWindow, IDockingWindowSite) + COM_INTERFACE_ENTRY_IID(IID_IShellBrowser, IShellBrowser) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IProfferService, IProfferService) + COM_INTERFACE_ENTRY_IID(IID_IShellBrowserService, IShellBrowserService) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IConnectionPointContainer, IConnectionPointContainer) + COM_INTERFACE_ENTRY_IID(IID_IWebBrowser, IWebBrowser) + COM_INTERFACE_ENTRY_IID(IID_IWebBrowserApp, IWebBrowserApp) + COM_INTERFACE_ENTRY_IID(IID_IWebBrowser2, IWebBrowser2) + COM_INTERFACE_ENTRY_IID(IID_ITravelLogClient, ITravelLogClient) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistHistory, IPersistHistory) + COM_INTERFACE_ENTRY_IID(IID_IBrowserService, IBrowserService) + COM_INTERFACE_ENTRY_IID(IID_IBrowserService2, IBrowserService2) + END_COM_MAP() }; extern HRESULT CreateProgressDialog(REFIID riid, void **ppv); CShellBrowser::CShellBrowser() { - int x; - fCurrentShellViewWindow = NULL; fCurrentDirectoryPIDL = NULL; fStatusBar = NULL; fStatusBarVisible = true; - for (x = 0; x < 3; x++) + for (INT x = 0; x < 3; x++) fClientBars[x].hwnd = NULL; fCurrentMenuBar = NULL; fHistoryObject = NULL; @@ -750,6 +747,7 @@ { } + // create window Create(HWND_DESKTOP, bounds, NULL, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0U); if (m_hWnd == NULL) return E_FAIL; @@ -763,24 +761,33 @@ if (FAILED(hResult)) return hResult; #endif - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IDockingWindow, (void **)&dockingWindow); + + // create interfaces + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IDockingWindow, reinterpret_cast(&dockingWindow)); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IPersistStreamInit, (void **)&persistStreamInit); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IPersistStreamInit, reinterpret_cast(&persistStreamInit)); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IObjectWithSite, (void **)&objectSite); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IObjectWithSite, reinterpret_cast(&objectSite)); if (FAILED(hResult)) return hResult; - hResult = objectSite->SetSite((IShellBrowser *)this); + + hResult = objectSite->SetSite(static_cast(this)); if (FAILED(hResult)) return hResult; + hResult = commandTarget->Exec(&CGID_PrivCITCommands, 1, 1 /* or 0 */, NULL, NULL); if (FAILED(hResult)) return hResult; + // TODO: create settingsStream from registry entry if (settingsStream.p == NULL) { @@ -800,13 +807,16 @@ fToolbarProxy.Initialize(m_hWnd, fClientBars[BIInternetToolbar].clientBar); - fStatusBar = CreateWindow(STATUSCLASSNAMEW, _T(""), WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, _AtlBaseModule.GetModuleInstance(), 0); + // create status bar + fStatusBar = CreateWindow(STATUSCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + SBT_NOBORDERS | SBT_TOOLTIPS, 0, 0, 500, 20, m_hWnd, (HMENU)0xa001, + _AtlBaseModule.GetModuleInstance(), 0); fStatusBarVisible = true; LPITEMIDLIST desktopPIDL; FOLDERSETTINGS newFolderSettings; + // browse desktop hResult = SHGetFolderLocation(NULL, CSIDL_DESKTOP, NULL, 0, &desktopPIDL); if (FAILED(hResult)) return hResult; @@ -814,38 +824,34 @@ newFolderSettings.fFlags = 0; hResult = BrowseToPIDL(desktopPIDL, BTP_UPDATE_NEXT_HISTORY); ILFree(desktopPIDL); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; ShowWindow(SW_SHOWNORMAL); - - // test code to make brand band animate { - CComPtr oleCommandTarget; - CComPtr serviceProvider; - CComPtr bandSite; - CComPtr deskBand; - CComPtr winEventHandler; - HRESULT hResult; + CComPtr oleCommandTarget; + CComPtr serviceProvider; + CComPtr bandSite; + CComPtr deskBand; + CComPtr winEventHandler; + HRESULT hResult; - if (fClientBars[BIInternetToolbar].clientBar.p == NULL) - return 0; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); - hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, (void **)&bandSite); - hResult = bandSite->QueryBand(5, &deskBand, NULL, NULL, 0); - deskBand->QueryInterface(IID_IWinEventHandler, (void **)&winEventHandler); - winEventHandler->IsWindowOwner(NULL); - deskBand->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); - oleCommandTarget->QueryStatus(&CGID_BrandCmdGroup, 0, NULL, NULL); - oleCommandTarget->Exec(&CGID_BrandCmdGroup, BBID_STARTANIMATION, 0, NULL, NULL); + if (fClientBars[BIInternetToolbar].clientBar.p == NULL) + return 0; + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); + hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, reinterpret_cast(&bandSite)); + hResult = bandSite->QueryBand(5, &deskBand, NULL, NULL, 0); + deskBand->QueryInterface(IID_IWinEventHandler, reinterpret_cast(&winEventHandler)); + winEventHandler->IsWindowOwner(NULL); + deskBand->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); + oleCommandTarget->QueryStatus(&CGID_BrandCmdGroup, 0, NULL, NULL); + oleCommandTarget->Exec(&CGID_BrandCmdGroup, BBID_STARTANIMATION, 0, NULL, NULL); } - - - return S_OK; } @@ -857,11 +863,11 @@ // called by shell view to browse to new folder // also called by explorer band to navigate to new folder - hResult = SHBindToFolder((LPITEMIDLIST)pidl, &newFolder); + hResult = SHBindToFolder(const_cast(pidl), &newFolder); newFolderSettings.ViewMode = FVM_LIST; newFolderSettings.fFlags = 0; - hResult = BrowseToPath(newFolder, (LPITEMIDLIST)pidl, &newFolderSettings, flags); - if (FAILED (hResult)) + hResult = BrowseToPath(newFolder, const_cast(pidl), &newFolderSettings, flags); + if (FAILED(hResult)) return hResult; return S_OK; } @@ -881,14 +887,17 @@ if (! _ILIsDesktop(pidl)) { length = pidl->mkid.cb; - pidlnext = (LPCITEMIDLIST)(((LPBYTE)pidl) + length); + pidlnext = + reinterpret_cast( + reinterpret_cast(pidl) + length); if (pidlnext->mkid.cb != 0) ret = FALSE; } return ret; } -HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *unused, LPCITEMIDLIST pidl, const IID *riid, LPVOID *ppv, LPITEMIDLIST *ppidlLast) +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *unused, LPCITEMIDLIST pidl, + const IID *riid, LPVOID *ppv, LPITEMIDLIST *ppidlLast) { CComPtr psf; LPITEMIDLIST pidlChild; @@ -924,18 +933,20 @@ return hResult; } -HRESULT IEGetNameAndFlagsEx(LPITEMIDLIST pidl, SHGDNF uFlags, long param10, LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) +HRESULT IEGetNameAndFlagsEx(LPITEMIDLIST pidl, SHGDNF uFlags, long param10, + LPWSTR pszBuf, UINT cchBuf, SFGAOF *rgfInOut) { CComPtr parentFolder; LPITEMIDLIST childPIDL; STRRET L108; HRESULT hResult; - hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, (void **)&parentFolder, &childPIDL); + hResult = SHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, + reinterpret_cast(&parentFolder), &childPIDL); hResult = parentFolder->GetDisplayNameOf(childPIDL, uFlags, &L108); StrRetToBufW(&L108, childPIDL, pszBuf, cchBuf); if (rgfInOut) - hResult = parentFolder->GetAttributesOf(1, (LPCITEMIDLIST *)&childPIDL, rgfInOut); + hResult = parentFolder->GetAttributesOf(1, const_cast(&childPIDL), rgfInOut); ILFree(childPIDL); return S_OK; } @@ -945,7 +956,8 @@ return IEGetNameAndFlagsEx(pidl, uFlags, 0, pszBuf, cchBuf, rgfInOut); } -HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, LPITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags) +HRESULT CShellBrowser::BrowseToPath(IShellFolder *newShellFolder, + LPITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags) { CComPtr oleCommandTarget; CComPtr objectWithSite; @@ -964,37 +976,53 @@ if (newShellFolder == NULL) return E_INVALIDARG; + hResult = GetTravelLog(&travelLog); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; + + // update history if (flags & BTP_UPDATE_CUR_HISTORY) { - if (travelLog->CountEntries((IDropTarget *)this) > 0) - hResult = travelLog->UpdateEntry((IDropTarget *)this, FALSE); + if (travelLog->CountEntries(static_cast(this)) > 0) + hResult = travelLog->UpdateEntry(static_cast(this), FALSE); // what to do with error? Do we want to halt browse because state save failed? } - hResult = newShellFolder->CreateViewObject(m_hWnd, IID_IShellView, (void **)&newShellView); - if (FAILED (hResult)) + + // create view object + hResult = newShellFolder->CreateViewObject(m_hWnd, IID_IShellView, reinterpret_cast(&newShellView)); + if (FAILED(hResult)) return hResult; previousView = fCurrentShellViewWindow; + + // enter updating section saveCursor = SetCursor(LoadCursor(NULL, IDC_WAIT)); windowUpdateIsLocked = LockWindowUpdate(TRUE); if (fCurrentShellView != NULL) ::SendMessage(fCurrentShellViewWindow, WM_SETREDRAW, 0, 0); - hResult = newShellView->QueryInterface(IID_IObjectWithSite, (void **)&objectWithSite); + + // set site + hResult = newShellView->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&objectWithSite)); if (SUCCEEDED(hResult) && objectWithSite.p != NULL) - hResult = objectWithSite->SetSite((IDropTarget *)this); + hResult = objectWithSite->SetSite(static_cast(this)); + + // update folder and view saveCurrentShellFolder = fCurrentShellFolder; saveCurrentShellView = fCurrentShellView; fCurrentShellFolder = newShellFolder; fCurrentShellView = newShellView; + + // get boundary if (previousView != NULL) ::GetWindowRect(previousView, &shellViewWindowBounds); else - memset(&shellViewWindowBounds, 0, sizeof(shellViewWindowBounds)); - ::MapWindowPoints(0, m_hWnd, (POINT *)&shellViewWindowBounds, 2); - hResult = newShellView->CreateViewWindow(saveCurrentShellView, folderSettings, this, &shellViewWindowBounds, &newShellViewWindow); - if (FAILED (hResult) || newShellViewWindow == NULL) + ZeroMemory(&shellViewWindowBounds, sizeof(shellViewWindowBounds)); + ::MapWindowPoints(0, m_hWnd, reinterpret_cast(&shellViewWindowBounds), 2); + + // create view window + hResult = newShellView->CreateViewWindow(saveCurrentShellView, folderSettings, + this, &shellViewWindowBounds, &newShellViewWindow); + if (FAILED(hResult) || newShellViewWindow == NULL) { fCurrentShellView = saveCurrentShellView; fCurrentShellFolder = saveCurrentShellFolder; @@ -1004,35 +1032,54 @@ SetCursor(saveCursor); return hResult; } + if (objectWithSite.p != NULL) hResult = objectWithSite->SetSite(NULL); + + // update current pidl ILFree(fCurrentDirectoryPIDL); fCurrentDirectoryPIDL = ILClone(absolutePIDL); + + // update view window if (saveCurrentShellView != NULL) saveCurrentShellView->DestroyViewWindow(); fCurrentShellViewWindow = newShellViewWindow; + + // get command target oleCommandTarget.Release(); - hResult = newShellView->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); + hResult = newShellView->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); + + // no use saveCurrentShellView.Release(); saveCurrentShellFolder.Release(); + hResult = newShellView->UIActivate(SVUIA_ACTIVATE_FOCUS); + + // leave updating section if (windowUpdateIsLocked) LockWindowUpdate(FALSE); SetCursor(saveCursor); + + // update history if (flags & BTP_UPDATE_NEXT_HISTORY) { - hResult = travelLog->AddEntry((IDropTarget *)this, FALSE); - hResult = travelLog->UpdateEntry((IDropTarget *)this, FALSE); + hResult = travelLog->AddEntry(static_cast(this), FALSE); + hResult = travelLog->UpdateEntry(static_cast(this), FALSE); } + + // completed FireNavigateComplete(L"c:\\temp"); // TODO: use real path here if (fCabinetState.fFullPathTitle) nameFlags = SHGDN_FORADDRESSBAR | SHGDN_FORPARSING; else nameFlags = SHGDN_FORADDRESSBAR; - hResult = IEGetNameAndFlags(fCurrentDirectoryPIDL, nameFlags, newTitle, sizeof(newTitle) / sizeof(wchar_t), NULL); + hResult = IEGetNameAndFlags(fCurrentDirectoryPIDL, nameFlags, newTitle, + sizeof(newTitle) / sizeof(wchar_t), NULL); if (SUCCEEDED(hResult)) SetWindowText(newTitle); + // TODO: Update the window icon + FireCommandStateChangeAll(); hResult = UpdateForwardBackState(); return S_OK; @@ -1047,10 +1094,11 @@ if (fClientBars[BIInternetToolbar].clientBar.p == NULL) return E_FAIL; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IServiceProvider, (void **)&serviceProvider); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IServiceProvider, reinterpret_cast(&serviceProvider)); if (FAILED(hResult)) return hResult; - hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, (void **)&bandSite); + hResult = serviceProvider->QueryService(SID_IBandSite, IID_IBandSite, reinterpret_cast(&bandSite)); if (FAILED(hResult)) return hResult; hResult = bandSite->QueryBand(1, &deskBand, NULL, NULL, 0); @@ -1075,23 +1123,23 @@ cache = &fClientBars[BIHorizontalBaseBar].clientBar.p; if (*cache == NULL) { - hResult = CreateBaseBar(IID_IUnknown, (void **)&newBaseBar); + hResult = CreateBaseBar(IID_IUnknown, reinterpret_cast(&newBaseBar)); if (FAILED(hResult)) return hResult; - hResult = CreateBaseBarSite(IID_IUnknown, (void **)&newBaseBarSite); + hResult = CreateBaseBarSite(IID_IUnknown, reinterpret_cast(&newBaseBarSite)); if (FAILED(hResult)) return hResult; // tell the new base bar about the shell browser - hResult = newBaseBar->QueryInterface(IID_IObjectWithSite, (void **)&objectWithSite); + hResult = newBaseBar->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&objectWithSite)); if (FAILED(hResult)) return hResult; - hResult = objectWithSite->SetSite((IDropTarget *)this); + hResult = objectWithSite->SetSite(static_cast(this)); if (FAILED(hResult)) return hResult; // tell the new base bar about the new base bar site - hResult = newBaseBar->QueryInterface(IID_IDeskBar, (void **)&deskBar); + hResult = newBaseBar->QueryInterface(IID_IDeskBar, reinterpret_cast(&deskBar)); if (FAILED(hResult)) return hResult; hResult = deskBar->SetClient(newBaseBarSite); @@ -1099,7 +1147,7 @@ return hResult; // tell the new base bar site about the new base bar - hResult = newBaseBarSite->QueryInterface(IID_IDeskBarClient, (void **)&deskBarClient); + hResult = newBaseBarSite->QueryInterface(IID_IDeskBarClient, reinterpret_cast(&deskBarClient)); if (FAILED(hResult)) return hResult; hResult = deskBarClient->SetDeskBarSite(newBaseBar); @@ -1108,7 +1156,7 @@ *cache = newBaseBar.Detach(); } - return (*cache)->QueryInterface(IID_IUnknown, (void **)theBaseBar); + return (*cache)->QueryInterface(IID_IUnknown, reinterpret_cast(theBaseBar)); } HRESULT CShellBrowser::ShowBand(const CLSID &classID, bool vertical) @@ -1125,19 +1173,20 @@ hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); if (FAILED(hResult)) return hResult; - hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, (void **)&newBand); + hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_IUnknown, + reinterpret_cast(&newBand)); if (FAILED(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_IDeskBar, (void **)&deskBar); + hResult = theBaseBar->QueryInterface(IID_IDeskBar, reinterpret_cast(&deskBar)); if (FAILED(hResult)) return hResult; hResult = deskBar->GetClient(&baseBarSite); if (FAILED(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_IDockingWindow, (void **)&dockingWindow); + hResult = theBaseBar->QueryInterface(IID_IDockingWindow, reinterpret_cast(&dockingWindow)); if (FAILED(hResult)) return hResult; - hResult = baseBarSite->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); + hResult = baseBarSite->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); if (FAILED(hResult)) return hResult; V_VT(&vaIn) = VT_UNKNOWN; @@ -1160,9 +1209,9 @@ if (newDirectory == NULL) return E_OUTOFMEMORY; ILRemoveLastID(newDirectory); - hResult = BrowseToPIDL((LPITEMIDLIST)newDirectory, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + hResult = BrowseToPIDL(newDirectory, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); ILFree(newDirectory); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; return S_OK; } @@ -1192,14 +1241,18 @@ memset(m_psp, 0, sizeof(m_psp)); memset(&m_PropSheet, 0, sizeof(m_PropSheet)); - hResult = CoCreateInstance(CLSID_ShellFldSetExt, NULL, CLSCTX_INPROC_SERVER, IID_IShellPropSheetExt, (void **)&folderOptionsSheet); + // create sheet object + hResult = CoCreateInstance(CLSID_ShellFldSetExt, NULL, CLSCTX_INPROC_SERVER, + IID_IShellPropSheetExt, reinterpret_cast(&folderOptionsSheet)); if (FAILED(hResult)) return E_FAIL; + // must set site in order for Apply to all Folders on Advanced page to be enabled - hResult = folderOptionsSheet->QueryInterface(IID_IObjectWithSite, (void **)&objectWithSite); + hResult = folderOptionsSheet->QueryInterface(IID_IObjectWithSite, reinterpret_cast(&objectWithSite)); if (SUCCEEDED(hResult) && objectWithSite.p != NULL) - hResult = objectWithSite->SetSite((IDispatch *)this); + hResult = objectWithSite->SetSite(static_cast(this)); m_PropSheet.phpage = m_psp; + #if 0 hResult = CoCreateInstance(CLSID_GlobalFolderSettings, NULL, CLSCTX_INPROC_SERVER, IID_IGlobalFolderSettings, (void **)&globalSettings); if (FAILED(hResult)) @@ -1208,23 +1261,27 @@ if (FAILED(hResult)) return E_FAIL; #endif - hResult = folderOptionsSheet->AddPages(AddFolderOptionsPage, (LPARAM)&m_PropSheet); + + // add pages + hResult = folderOptionsSheet->AddPages(AddFolderOptionsPage, reinterpret_cast(&m_PropSheet)); if (FAILED(hResult)) return E_FAIL; + if (fCurrentShellView != NULL) { - hResult = fCurrentShellView->AddPropertySheetPages( 0, AddFolderOptionsPage, (LPARAM)&m_PropSheet); + hResult = fCurrentShellView->AddPropertySheetPages( + 0, AddFolderOptionsPage, reinterpret_cast(&m_PropSheet)); if (FAILED(hResult)) return E_FAIL; } + // show sheet m_PropSheet.dwSize = sizeof(PROPSHEETHEADER); m_PropSheet.dwFlags = 0; m_PropSheet.hwndParent = m_hWnd; m_PropSheet.hInstance = _AtlBaseModule.GetResourceInstance(); m_PropSheet.pszCaption = _T("Folder Options"); m_PropSheet.nStartPage = 0; - PropertySheet(&m_PropSheet); return S_OK; } @@ -1244,7 +1301,7 @@ previousMessage = pThis->m_pCurrentMsg; pThis->m_pCurrentMsg = &msg; - hResult = pThis->GetMenuBand(IID_IMenuBand, (void **)&menuBand); + hResult = pThis->GetMenuBand(IID_IMenuBand, reinterpret_cast(&menuBand)); if (SUCCEEDED(hResult) && menuBand.p != NULL) { hResult = menuBand->TranslateMenuMessage(&msg, &lResult); @@ -1261,9 +1318,9 @@ { if (uMsg == WM_NCDESTROY) { - saveWindowProc = (WNDPROC)GetWindowLongPtr(hWnd, GWL_WNDPROC); + saveWindowProc = reinterpret_cast(GetWindowLongPtr(hWnd, GWL_WNDPROC)); lResult = pThis->DefWindowProc(uMsg, wParam, lParam); - if (saveWindowProc == (WNDPROC)GetWindowLongPtr(hWnd, GWL_WNDPROC)) + if (saveWindowProc == reinterpret_cast(GetWindowLongPtr(hWnd, GWL_WNDPROC))) SetWindowLongPtr(hWnd, GWL_WNDPROC, (LONG_PTR)pThis->m_pfnSuperWindowProc); pThis->m_dwState |= WINSTATE_DESTROYED; } @@ -1305,7 +1362,8 @@ if (fClientBars[x].hwnd == NULL && fClientBars[x].clientBar != NULL) { - hResult = fClientBars[x].clientBar->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = fClientBars[x].clientBar->QueryInterface( + IID_IOleWindow, reinterpret_cast(&oleWindow)); if (SUCCEEDED(hResult)) hResult = oleWindow->GetWindow(&fClientBars[x].hwnd); } @@ -1352,7 +1410,7 @@ { CComPtr theDispatch; - hResult = (*pp)->QueryInterface(IID_IDispatch, (void **)&theDispatch); + hResult = (*pp)->QueryInterface(IID_IDispatch, reinterpret_cast(&theDispatch)); hResult = theDispatch->Invoke(dispIdMember, GUID_NULL, 0, DISPATCH_METHOD, ¶ms, NULL, NULL, NULL); } pp++; @@ -1364,7 +1422,7 @@ { CComPtr theDispatch; - hResult = (*pp)->QueryInterface(IID_IDispatch, (void **)&theDispatch); + hResult = (*pp)->QueryInterface(IID_IDispatch, reinterpret_cast(&theDispatch)); hResult = theDispatch->Invoke(dispIdMember, GUID_NULL, 0, DISPATCH_METHOD, ¶ms, NULL, NULL, NULL); } pp++; @@ -1419,15 +1477,15 @@ canGoBack = false; canGoForward = false; hResult = GetTravelLog(&travelLog); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; - hResult = travelLog->GetTravelEntry((IDropTarget *)this, TLOG_BACK, &unusedEntry); + hResult = travelLog->GetTravelEntry(static_cast(this), TLOG_BACK, &unusedEntry); if (SUCCEEDED(hResult)) { canGoBack = true; unusedEntry.Release(); } - hResult = travelLog->GetTravelEntry((IDropTarget *)this, TLOG_FORE, &unusedEntry); + hResult = travelLog->GetTravelEntry(static_cast(this), TLOG_FORE, &unusedEntry); if (SUCCEEDED(hResult)) { canGoForward = true; @@ -1449,9 +1507,10 @@ position = GetMenuItemCount(theMenu); hResult = GetTravelLog(&travelLog); - if (FAILED (hResult)) + if (FAILED(hResult)) return; - hResult = travelLog->InsertMenuEntries((IDropTarget *)this, theMenu, position, IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, TLMENUF_BACKANDFORTH | TLMENUF_CHECKCURRENT); + hResult = travelLog->InsertMenuEntries(static_cast(this), theMenu, position, + IDM_GOTO_TRAVEL_FIRSTTARGET, IDM_GOTO_TRAVEL_LASTTARGET, TLMENUF_BACKANDFORTH | TLMENUF_CHECKCURRENT); if (SUCCEEDED(hResult)) { menuItemInfo.cbSize = sizeof(menuItemInfo); @@ -1483,7 +1542,8 @@ commandList[3].cmdID = ITID_TOOLBARLOCKED; commandList[4].cmdID = ITID_CUSTOMIZEENABLED; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); if (SUCCEEDED(hResult)) hResult = oleCommandTarget->QueryStatus(&CGID_PrivCITCommands, 5, commandList, NULL); if (FAILED(hResult)) @@ -1520,10 +1580,10 @@ return true; if (int1 == NULL || int2 == NULL) return false; - hResult = int1->QueryInterface(IID_IUnknown, (void **)&int1Retry); + hResult = int1->QueryInterface(IID_IUnknown, reinterpret_cast(&int1Retry)); if (FAILED(hResult)) return false; - hResult = int2->QueryInterface(IID_IUnknown, (void **)&int2Retry); + hResult = int2->QueryInterface(IID_IUnknown, reinterpret_cast(&int2Retry)); if (FAILED(hResult)) return false; if (int1Retry == int2Retry) @@ -1535,10 +1595,9 @@ { RECT availableBounds; static const INT excludeItems[] = {1, 1, 1, 0xa001, 0, 0}; - int x; - GetEffectiveClientRect(m_hWnd, &availableBounds, (INT *)&excludeItems); - for (x = 0; x < 3; x++) + GetEffectiveClientRect(m_hWnd, &availableBounds, const_cast(excludeItems)); + for (INT x = 0; x < 3; x++) { if (fClientBars[x].clientBar.p != NULL && !IUnknownIsEqual(fClientBars[x].clientBar, punkObj)) { @@ -1559,9 +1618,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::SetBorderSpaceDW(IUnknown* punkObj, LPCBORDERWIDTHS pbw) { - int x; - - for (x = 0; x < 3; x++) + for (INT x = 0; x < 3; x++) { if (IUnknownIsEqual(fClientBars[x].clientBar, punkObj)) { @@ -1574,7 +1631,8 @@ return E_INVALIDARG; } -HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +HRESULT STDMETHODCALLTYPE CShellBrowser::QueryStatus(const GUID *pguidCmdGroup, + ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) { CComPtr commandTarget; HRESULT hResult; @@ -1585,7 +1643,8 @@ { if (fCurrentShellView.p != NULL) { - hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, + reinterpret_cast(&commandTarget)); if (SUCCEEDED(hResult) && commandTarget.p != NULL) return commandTarget->QueryStatus(NULL, 1, prgCmds, pCmdText); } @@ -1641,7 +1700,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CShellBrowser::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CShellBrowser::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, + DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { HRESULT hResult; @@ -1664,7 +1724,8 @@ return S_OK; case 0x35: // don't do this, and the internet toolbar doesn't create a menu band V_VT(pvaOut) = VT_INT_PTR; - V_INTREF(pvaOut) = (INT *)LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU)); + V_INTREF(pvaOut) = reinterpret_cast( + LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU))); return S_OK; case 0x38: // indicate if this cabinet was opened as a browser @@ -1778,7 +1839,7 @@ if (IsMenu(hmenuShared) == FALSE) return E_FAIL; - hResult = GetMenuBand(IID_IShellMenu, (void **)&shellMenu); + hResult = GetMenuBand(IID_IShellMenu, reinterpret_cast(&shellMenu)); if (FAILED(hResult)) return hResult; hResult = shellMenu->SetMenu(hmenuShared, NULL, SMSET_DONTOWN); @@ -1812,7 +1873,7 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { - return BrowseToPIDL((LPITEMIDLIST)pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); + return BrowseToPIDL(const_cast(pidl), BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); } HRESULT STDMETHODCALLTYPE CShellBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) @@ -1844,7 +1905,8 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CShellBrowser::SendControlMsg(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) +HRESULT STDMETHODCALLTYPE CShellBrowser::SendControlMsg( + UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *pret) { LPARAM result; @@ -1866,7 +1928,7 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CShellBrowser::QueryActiveShellView(struct IShellView **ppshv) +HRESULT STDMETHODCALLTYPE CShellBrowser::QueryActiveShellView(IShellView **ppshv) { if (ppshv == NULL) return E_POINTER; @@ -1876,7 +1938,7 @@ return S_OK; } -HRESULT STDMETHODCALLTYPE CShellBrowser::OnViewWindowActive(struct IShellView *ppshv) +HRESULT STDMETHODCALLTYPE CShellBrowser::OnViewWindowActive(IShellView *ppshv) { return E_NOTIMPL; } @@ -1886,7 +1948,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT STDMETHODCALLTYPE CShellBrowser::DragEnter( + IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { return E_NOTIMPL; } @@ -1901,7 +1964,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::Drop(IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) +HRESULT STDMETHODCALLTYPE CShellBrowser::Drop( + IDataObject *pDataObj, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { return E_NOTIMPL; } @@ -1943,12 +2007,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +HRESULT STDMETHODCALLTYPE CShellBrowser::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +HRESULT STDMETHODCALLTYPE CShellBrowser::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { return E_NOTIMPL; } @@ -1982,7 +2048,7 @@ *pptl = NULL; if (fTravelLog.p == NULL) { - hResult = CreateTravelLog(IID_ITravelLog, (void **)&fTravelLog); + hResult = CreateTravelLog(IID_ITravelLog, reinterpret_cast(&fTravelLog)); if (FAILED(hResult)) return hResult; } @@ -2121,7 +2187,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::OnHttpEquiv(IShellView *psv, BOOL fDone, VARIANT *pvarargIn, VARIANT *pvarargOut) +HRESULT STDMETHODCALLTYPE CShellBrowser::OnHttpEquiv( + IShellView *psv, BOOL fDone, VARIANT *pvarargIn, VARIANT *pvarargOut) { return E_NOTIMPL; } @@ -2196,7 +2263,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::CreateViewWindow(IShellView *psvNew, IShellView *psvOld, LPRECT prcView, HWND *phwnd) +HRESULT STDMETHODCALLTYPE CShellBrowser::CreateViewWindow( + IShellView *psvNew, IShellView *psvOld, LPRECT prcView, HWND *phwnd) { return E_NOTIMPL; } @@ -2306,12 +2374,14 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::_ExecChildren(IUnknown *punkBar, BOOL fBroadcast, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut) +HRESULT STDMETHODCALLTYPE CShellBrowser::_ExecChildren(IUnknown *punkBar, BOOL fBroadcast, + const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANTARG *pvarargIn, VARIANTARG *pvarargOut) { return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::_SendChildren(HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT STDMETHODCALLTYPE CShellBrowser::_SendChildren( + HWND hwndBar, BOOL fBroadcast, UINT uMsg, WPARAM wParam, LPARAM lParam) { return E_NOTIMPL; } @@ -2411,7 +2481,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayGetNextToolbarFocus(LPMSG lpMsg, UINT itbNext, int citb, LPTOOLBARITEM *pptbi, HWND *phwnd) +HRESULT STDMETHODCALLTYPE CShellBrowser::v_MayGetNextToolbarFocus( + LPMSG lpMsg, UINT itbNext, int citb, LPTOOLBARITEM *pptbi, HWND *phwnd) { return E_NOTIMPL; } @@ -2452,9 +2523,9 @@ HRESULT hResult; hResult = GetTravelLog(&travelLog); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; - return travelLog->Travel((IDropTarget *)this, TLOG_BACK); + return travelLog->Travel(static_cast(this), TLOG_BACK); } HRESULT STDMETHODCALLTYPE CShellBrowser::GoForward() @@ -2463,9 +2534,9 @@ HRESULT hResult; hResult = GetTravelLog(&travelLog); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; - return travelLog->Travel((IDropTarget *)this, TLOG_FORE); + return travelLog->Travel(static_cast(this), TLOG_FORE); } HRESULT STDMETHODCALLTYPE CShellBrowser::GoHome() @@ -2478,7 +2549,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate(BSTR URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) +HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate(BSTR URL, VARIANT *Flags, + VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { return E_NOTIMPL; } @@ -2497,8 +2569,8 @@ CComPtr oleCommandTarget; HRESULT hResult; - hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, (void **)&oleCommandTarget); - if (FAILED (hResult)) + hResult = fCurrentShellView->QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&oleCommandTarget)); + if (FAILED(hResult)) return hResult; return oleCommandTarget->Exec(NULL, 22, 1, Level, NULL); } @@ -2697,7 +2769,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) +HRESULT STDMETHODCALLTYPE CShellBrowser::Navigate2(VARIANT *URL, VARIANT *Flags, + VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { LPITEMIDLIST pidl; HRESULT hResult; @@ -2709,7 +2782,7 @@ return E_INVALIDARG; pidl = (LPITEMIDLIST)V_ARRAY(URL)->pvData; hResult = BrowseToPIDL((LPITEMIDLIST)pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; return S_OK; } @@ -2719,7 +2792,8 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellBrowser::ExecWB(OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +HRESULT STDMETHODCALLTYPE CShellBrowser::ExecWB(OLECMDID cmdID, OLECMDEXECOPT cmdexecopt, + VARIANT *pvaIn, VARIANT *pvaOut) { return E_NOTIMPL; } @@ -2872,7 +2946,8 @@ ILFree(pidl); return E_FAIL; } - hResult = CoCreateInstance(oldState.persistClass, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_INPROC_SERVER, IID_IOleObject, (void **)&viewHistoryObject); + hResult = CoCreateInstance(oldState.persistClass, NULL, CLSCTX_LOCAL_SERVER | CLSCTX_INPROC_SERVER, + IID_IOleObject, reinterpret_cast(&viewHistoryObject)); fHistoryObject = viewHistoryObject; fHistoryStream = pStream; fHistoryBindContext = pbc; @@ -2892,7 +2967,8 @@ persistState newState; HRESULT hResult; - hResult = fCurrentShellView->GetItemObject(SVGIO_BACKGROUND, IID_IPersistHistory, (void **)&viewPersistHistory); + hResult = fCurrentShellView->GetItemObject( + SVGIO_BACKGROUND, IID_IPersistHistory, reinterpret_cast(&viewPersistHistory)); memset(&newState, 0, sizeof(newState)); newState.dwSize = sizeof(newState); newState.browseType = 2; @@ -2941,20 +3017,21 @@ CComPtr dockingWindow; RECT availableBounds; static const INT excludeItems[] = {1, 1, 1, 0xa001, 0, 0}; - int x; HRESULT hResult; if (wParam != SIZE_MINIMIZED) { - GetEffectiveClientRect(m_hWnd, &availableBounds, (INT *)&excludeItems); - for (x = 0; x < 3; x++) + GetEffectiveClientRect(m_hWnd, &availableBounds, const_cast(excludeItems)); + for (INT x = 0; x < 3; x++) { if (fClientBars[x].clientBar != NULL) { - hResult = fClientBars[x].clientBar->QueryInterface(IID_IDockingWindow, (void **)&dockingWindow); + hResult = fClientBars[x].clientBar-> + QueryInterface(IID_IDockingWindow, reinterpret_cast(&dockingWindow)); if (SUCCEEDED(hResult) && dockingWindow != NULL) { - hResult = dockingWindow->ResizeBorderDW(&availableBounds, (IDropTarget *)this, TRUE); + hResult = dockingWindow->ResizeBorderDW( + &availableBounds, static_cast(this), TRUE); break; } } @@ -2968,7 +3045,7 @@ { HMENU theMenu; - theMenu = (HMENU)wParam; + theMenu = reinterpret_cast(wParam); if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_VIEW)) UpdateViewMenu(theMenu); return RelayMsgToShellView(uMsg, wParam, lParam, bHandled); @@ -3058,7 +3135,7 @@ hShlwapi = LoadLibrary(TEXT("browseui.dll")); if (hShlwapi != NULL) - Func = (PSHOpenNewFrame)GetProcAddress(hShlwapi, (LPCSTR)103); + Func = reinterpret_cast(GetProcAddress(hShlwapi, (LPCSTR)103)); else Func = NULL; if (Func != NULL) @@ -3086,7 +3163,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARLOCKED, 0, NULL, NULL); @@ -3098,7 +3176,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TOOLBARBANDSHOWN, 0, NULL, NULL); @@ -3110,7 +3189,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_ADDRESSBANDSHOWN, 0, NULL, NULL); @@ -3122,7 +3202,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_LINKSBANDSHOWN, 0, NULL, NULL); @@ -3134,7 +3215,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_TEXTLABELS, 0, NULL, NULL); @@ -3146,7 +3228,8 @@ CComPtr commandTarget; HRESULT hResult; - hResult = fClientBars[BIInternetToolbar].clientBar->QueryInterface(IID_IOleCommandTarget, (void **)&commandTarget); + hResult = fClientBars[BIInternetToolbar].clientBar-> + QueryInterface(IID_IOleCommandTarget, reinterpret_cast(&commandTarget)); if (FAILED(hResult)) return 0; hResult = commandTarget->Exec(&CGID_PrivCITCommands, ITID_CUSTOMIZEENABLED, 0, NULL, NULL); @@ -3202,14 +3285,14 @@ ATLTRY (theCabinet = new CComObject); if (theCabinet == NULL) return E_OUTOFMEMORY; - hResult = theCabinet->QueryInterface(IID_IShellBrowser, (void **)&shellBrowser); - if (FAILED (hResult)) + hResult = theCabinet->QueryInterface(IID_IShellBrowser, reinterpret_cast(&shellBrowser)); + if (FAILED(hResult)) { delete theCabinet; return hResult; } hResult = theCabinet->Initialize(parameters->directoryPIDL, 0, 0, 0); - if (FAILED (hResult)) + if (FAILED(hResult)) return hResult; ExplorerMessageLoop(); OleUninitialize(); Index: dll/win32/browseui/toolsband.cpp =================================================================== --- dll/win32/browseui/toolsband.cpp (revision 58787) +++ dll/win32/browseui/toolsband.cpp (working copy) @@ -228,11 +228,11 @@ fDockSite->Release(); if (pUnkSite == NULL) return S_OK; - hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, (void **)&fDockSite); + hResult = pUnkSite->QueryInterface(IID_IDockingWindowSite, reinterpret_cast(&fDockSite)); if (FAILED(hResult)) return hResult; parentWindow = NULL; - hResult = pUnkSite->QueryInterface(IID_IOleWindow, (void **)&oleWindow); + hResult = pUnkSite->QueryInterface(IID_IOleWindow, reinterpret_cast(&oleWindow)); if (SUCCEEDED(hResult)) { oleWindow->GetWindow(&parentWindow); @@ -241,7 +241,7 @@ if (!::IsWindow(parentWindow)) return E_FAIL; - toolbar = CreateWindowEx(TBSTYLE_EX_DOUBLEBUFFER, TOOLBARCLASSNAMEW, _T(""), WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | + toolbar = CreateWindowEx(TBSTYLE_EX_DOUBLEBUFFER, TOOLBARCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP, 0, 0, 500, 20, parentWindow, NULL, _AtlBaseModule.GetModuleInstance(), 0); @@ -252,10 +252,13 @@ SendMessage(WM_USER + 100, GetSystemMetrics(SM_CXEDGE) / 2, 0); SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); SendMessage(TB_SETMAXTEXTROWS, 1, 0); - SendMessage(TB_SETEXTENDEDSTYLE, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); + SendMessage(TB_SETEXTENDEDSTYLE, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS, + TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS); HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - HBITMAP imageBitmap = (HBITMAP)LoadImage(shell32Instance, MAKEINTRESOURCE(214), IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + HBITMAP imageBitmap = reinterpret_cast( + LoadImage(shell32Instance, MAKEINTRESOURCE(214), + IMAGE_BITMAP, 0, 0, LR_DEFAULTSIZE | LR_CREATEDIBSECTION)); DIBSECTION bitmapInfo; GetObjectW(imageBitmap, sizeof(bitmapInfo), &bitmapInfo); @@ -363,7 +366,7 @@ LRESULT CToolsBand::OnGetButtonInfo(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled) { - TBNOTIFYW *pTBntf = (TBNOTIFYW *)pNMHDR; + TBNOTIFYW *pTBntf = reinterpret_cast(pNMHDR); if (pTBntf->iItem >= 0 && pTBntf->iItem < (numShownButtons + numHiddenButtons)) { @@ -386,8 +389,8 @@ ATLTRY (theMenuBar = new CComObject); if (theMenuBar == NULL) return E_OUTOFMEMORY; - hResult = theMenuBar->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theMenuBar->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theMenuBar; return hResult; Index: dll/win32/browseui/travellog.cpp =================================================================== --- dll/win32/browseui/travellog.cpp (revision 58787) +++ dll/win32/browseui/travellog.cpp (working copy) @@ -141,7 +141,7 @@ CComPtr globalStream; HRESULT hResult; - hResult = punk->QueryInterface(IID_IPersistHistory, (void **)&persistHistory); + hResult = punk->QueryInterface(IID_IPersistHistory, reinterpret_cast(&persistHistory)); if (FAILED(hResult)) return hResult; hResult = CreateStreamOnHGlobal(fPersistState, FALSE, &globalStream); @@ -166,7 +166,7 @@ fPIDL = NULL; GlobalFree(fPersistState); fPersistState = NULL; - hResult = punk->QueryInterface(IID_ITravelLogClient, (void **)&travelLogClient); + hResult = punk->QueryInterface(IID_ITravelLogClient, reinterpret_cast(&travelLogClient)); if (FAILED(hResult)) return hResult; hResult = travelLogClient->GetWindowData(&windowData); @@ -174,7 +174,7 @@ return hResult; fPIDL = windowData.pidl; // TODO: Properly free the windowData - hResult = punk->QueryInterface(IID_IPersistHistory, (void **)&persistHistory); + hResult = punk->QueryInterface(IID_IPersistHistory, reinterpret_cast(&persistHistory)); if (FAILED(hResult)) return hResult; globalStorage = GlobalAlloc(GMEM_FIXED, 0); @@ -363,7 +363,7 @@ hResult = FindRelativeEntry(iOffset, &destinationEntry); if (FAILED(hResult)) return hResult; - return destinationEntry->QueryInterface(IID_ITravelEntry, (void **)ppte); + return destinationEntry->QueryInterface(IID_ITravelEntry, reinterpret_cast(ppte)); } HRESULT STDMETHODCALLTYPE CTravelLog::FindTravelEntry(IUnknown *punk, LPCITEMIDLIST pidl, ITravelEntry **ppte) @@ -424,7 +424,8 @@ wcscpy(buffer, tempBuffer); } -HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hmenu, int nPos, int idFirst, int idLast, DWORD dwFlags) +HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hmenu, + int nPos, int idFirst, int idLast, DWORD dwFlags) { CTravelEntry *currentItem; MENUITEMINFO menuItemInfo; @@ -570,8 +571,8 @@ ATLTRY (theTravelLog = new CComObject); if (theTravelLog == NULL) return E_OUTOFMEMORY; - hResult = theTravelLog->QueryInterface (riid, (void **)ppv); - if (FAILED (hResult)) + hResult = theTravelLog->QueryInterface(riid, reinterpret_cast(ppv)); + if (FAILED(hResult)) { delete theTravelLog; return hResult;