Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-29 15:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[QCKLNCH]

Browse source 
-Refactors and some code fixes (like CComHeapPtr, IID_PPV_ARG, _countof, etc.).
-Minor suggestions fixed.

CR-122 (https://code.reactos.org/cru/CR-122#details)

SelfNote: Should check if CComHeapPtr is overused! ;p

svn path=/branches/GSoC_2017/shellext/; revision=75272
This commit is contained in:
Shriraj Sawant 2017-07-03 15:36:00 +00:00
parent 26958e704b
commit 180321d87a
3 changed files with 121 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
reactos/dll/shellext/qcklnch/CISFBand.cpp
View file

@ -20,8 +20,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcklnch);
CISFBand::CISFBand() : CISFBand::CISFBand() :
m_BandID(0), m_BandID(0),
m_hWndTb(NULL),
m_hInstance(NULL),
m_pidl(NULL), m_pidl(NULL),
m_textFlag(true), m_textFlag(true),
m_iconFlag(true) m_iconFlag(true)
@ -44,10 +42,10 @@ LRESULT CISFBand::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
pt.y = GET_Y_LPARAM(pos); pt.y = GET_Y_LPARAM(pos);
ScreenToClient(&pt); ScreenToClient(&pt);
int index = SendMessage(m_hWndTb, TB_HITTEST, 0, (LPARAM)&pt); int index = SendMessage(m_hWnd, TB_HITTEST, 0, (LPARAM)&pt);
bool chk = SendMessage(m_hWndTb, TB_GETBUTTON, abs(index), (LPARAM)&tb); bool chk = SendMessage(m_hWnd, TB_GETBUTTON, abs(index), (LPARAM)&tb);
if(chk) if(chk)
SHInvokeDefaultCommand(m_hWndTb, m_pISF, (LPITEMIDLIST)tb.dwData); SHInvokeDefaultCommand(m_hWnd, m_pISF, (LPITEMIDLIST)tb.dwData);
return 0; return 0;
} }
@ -64,16 +62,20 @@ LRESULT CISFBand::OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
pt.y = GET_Y_LPARAM(pos); pt.y = GET_Y_LPARAM(pos);
ScreenToClient(&pt); ScreenToClient(&pt);
int index = SendMessage(m_hWndTb, TB_HITTEST, 0, (LPARAM)&pt); int index = SendMessage(m_hWnd, TB_HITTEST, 0, (LPARAM)&pt);
bool chk = SendMessage(m_hWndTb, TB_GETBUTTON, abs(index), (LPARAM)&tb); bool chk = SendMessage(m_hWnd, TB_GETBUTTON, abs(index), (LPARAM)&tb);
LPITEMIDLIST pidl = (LPITEMIDLIST)tb.dwData; CComHeapPtr<ITEMIDLIST> pidl((LPITEMIDLIST)tb.dwData);
if (chk) if (chk)
{ {
ClientToScreen(&pt); ClientToScreen(&pt);
hr = m_pISF->GetUIObjectOf(m_hWndTb, 1, &pidl, IID_IContextMenu, NULL, (void**)&picm); hr = m_pISF->GetUIObjectOf(m_hWnd, 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &picm));
if (FAILED_UNEXPECTEDLY(hr)) return hr;
hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY); hr = picm->QueryContextMenu(fmenu, 0, 1, 0x7FFF, CMF_DEFAULTONLY);
int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWndTb, 0); if (FAILED_UNEXPECTEDLY(hr)) return hr;
int id = TrackPopupMenuEx(fmenu, TPM_LEFTALIGN | TPM_BOTTOMALIGN | TPM_RETURNCMD, pt.x, pt.y, m_hWnd, 0);
if (id > 0) if (id > 0)
{ {
CMINVOKECOMMANDINFOEX info = { 0 }; CMINVOKECOMMANDINFOEX info = { 0 };
@ -87,7 +89,7 @@ LRESULT CISFBand::OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
{ {
info.fMask |= CMIC_MASK_SHIFT_DOWN; info.fMask |= CMIC_MASK_SHIFT_DOWN;
} }
info.hwnd = m_hWndTb; info.hwnd = m_hWnd;
info.lpVerb = MAKEINTRESOURCEA(id - 1); info.lpVerb = MAKEINTRESOURCEA(id - 1);
info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF); info.lpVerbW = MAKEINTRESOURCEW(id - 0x7FFF);
info.nShow = SW_SHOWNORMAL; info.nShow = SW_SHOWNORMAL;
@ -101,50 +103,60 @@ LRESULT CISFBand::OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa
} }
// ToolbarTest // ToolbarTest
HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst) HRESULT CISFBand::CreateSimpleToolbar(HWND hWndParent)
{ {
// Declare and initialize local constants. // Declare and initialize local constants.
const DWORD buttonStyles = BTNS_AUTOSIZE; const DWORD buttonStyles = BTNS_AUTOSIZE;
// Create the toolbar. // Create the toolbar.
HWND hWndToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, NULL, m_hWnd = CreateWindowEx(0, TOOLBARCLASSNAME, NULL,
WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE | CCS_NODIVIDER, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, WS_CHILD | TBSTYLE_FLAT | TBSTYLE_LIST | CCS_NORESIZE | CCS_NODIVIDER, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0,
hWndParent, NULL, hInst, NULL); hWndParent, NULL, 0, NULL);
if (hWndToolbar == NULL) if (m_hWnd == NULL)
return NULL; return E_FAIL;
// Set the image list. // Set the image list.
HIMAGELIST* piml; HIMAGELIST* piml;
HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return NULL; {
SendMessage(hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)piml); DestroyWindow();
return hr;
}
SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml);
// Enumerate objects // Enumerate objects
CComPtr<IEnumIDList> pedl; CComPtr<IEnumIDList> pEndl;
LPITEMIDLIST pidl = NULL; CComHeapPtr<ITEMIDLIST> pidl;
STRRET stret; STRRET stret;
ULONG count = 0; ULONG count = 0;
hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pedl); hr = m_pISF->EnumObjects(0, SHCONTF_FOLDERS, &pEndl);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return NULL; {
DestroyWindow();
return hr;
}
for (int i=0; pedl->Next(1, &pidl, 0) != S_FALSE; i++, count++) for (int i=0; pEndl->Next(1, &pidl, NULL) != S_FALSE; i++, count++)
{ {
WCHAR sz[MAX_PATH]; WCHAR sz[MAX_PATH];
int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL); int index = SHMapPIDLToSystemImageListIndex(m_pISF, pidl, NULL);
m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret); hr = m_pISF->GetDisplayNameOf(pidl, SHGDN_NORMAL, &stret);
StrRetToBuf(&stret, pidl, sz, sizeof(sz)); if (FAILED_UNEXPECTEDLY(hr))
{
strcpyW(sz, L"<Unknown-Name>");
}
else
StrRetToBuf(&stret, pidl, sz, _countof(sz));
TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)pidl, (INT_PTR)sz }; TBBUTTON tb = { MAKELONG(index, 0), i, TBSTATE_ENABLED, buttonStyles,{ 0 }, (DWORD_PTR)*&pidl, (INT_PTR)sz };
SendMessage(hWndToolbar, TB_INSERTBUTTONW, 0, (LPARAM)&tb); SendMessage(m_hWnd, TB_INSERTBUTTONW, 0, (LPARAM)&tb);
} }
// Resize the toolbar, and then show it. // Resize the toolbar, and then show it.
SendMessage(hWndToolbar, TB_AUTOSIZE, 0, 0); SendMessage(m_hWnd, TB_AUTOSIZE, 0, 0);
CoTaskMemFree((void*)pidl); return hr;
return hWndToolbar;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -165,8 +177,11 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
} }
m_Site = pUnkSite; m_Site = pUnkSite;
m_hWndTb = CreateSimpleToolbar(hwndParent, m_hInstance); hr = CreateSimpleToolbar(hwndParent);
hr = SubclassWindow(m_hWndTb); if (FAILED_UNEXPECTEDLY(hr))
return hr;
hr = SubclassWindow(m_hWnd);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
@ -192,11 +207,11 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
// *** IDeskBand *** // *** IDeskBand ***
STDMETHODIMP CISFBand::GetWindow(OUT HWND *phwnd) STDMETHODIMP CISFBand::GetWindow(OUT HWND *phwnd)
{ {
if (!m_hWndTb) if (!m_hWnd)
return E_FAIL; return E_FAIL;
if (!phwnd) if (!phwnd)
return E_INVALIDARG; return E_POINTER;
*phwnd = m_hWndTb; *phwnd = m_hWnd;
return S_OK; return S_OK;
} }
@ -209,24 +224,26 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
STDMETHODIMP CISFBand::ShowDW(IN BOOL bShow) STDMETHODIMP CISFBand::ShowDW(IN BOOL bShow)
{ {
if (m_hWndTb) if (m_hWnd)
{ {
::ShowWindow(m_hWndTb, bShow ? SW_SHOW : SW_HIDE); ShowWindow(bShow ? SW_SHOW : SW_HIDE);
return S_OK;
} }
return S_OK; return E_FAIL;
} }
STDMETHODIMP CISFBand::CloseDW(IN DWORD dwReserved) STDMETHODIMP CISFBand::CloseDW(IN DWORD dwReserved)
{ {
if (m_hWndTb) if (m_hWnd)
{ {
::ShowWindow(m_hWndTb, SW_HIDE); ShowWindow(SW_HIDE);
::DestroyWindow(m_hWndTb); DestroyWindow();
m_hWndTb = NULL; m_hWnd = NULL;
return S_OK;
} }
return S_OK; return E_FAIL;
} }
STDMETHODIMP CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) STDMETHODIMP CISFBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved)
@ -238,9 +255,9 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
STDMETHODIMP CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) STDMETHODIMP CISFBand::GetBandInfo(IN DWORD dwBandID, IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi)
{ {
TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWndTb); TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd);
if (m_hWndTb && pdbi) if (m_hWnd && pdbi)
{ {
m_BandID = dwBandID; m_BandID = dwBandID;
@ -250,19 +267,19 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
POINTL maxSize; POINTL maxSize;
POINTL itemSize; POINTL itemSize;
::GetWindowRect(m_hWndTb, &actualRect); GetWindowRect(&actualRect);
actualSize.x = actualRect.right - actualRect.left; actualSize.x = actualRect.right - actualRect.left;
actualSize.y = actualRect.bottom - actualRect.top; actualSize.y = actualRect.bottom - actualRect.top;
// Obtain the ideal size, to be used as min and max // Obtain the ideal size, to be used as min and max
SendMessageW(m_hWndTb, TB_AUTOSIZE, 0, 0); SendMessageW(m_hWnd, TB_AUTOSIZE, 0, 0);
SendMessageW(m_hWndTb, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&maxSize)); SendMessageW(m_hWnd, TB_GETMAXSIZE, 0, reinterpret_cast<LPARAM>(&maxSize));
idealSize = maxSize; idealSize = maxSize;
SendMessageW(m_hWndTb, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&idealSize)); SendMessageW(m_hWnd, TB_GETIDEALSIZE, FALSE, reinterpret_cast<LPARAM>(&idealSize));
// Obtain the button size, to be used as the integral size // Obtain the button size, to be used as the integral size
DWORD size = SendMessageW(m_hWndTb, TB_GETBUTTONSIZE, 0, 0); DWORD size = SendMessageW(m_hWnd, TB_GETBUTTONSIZE, 0, 0);
itemSize.x = GET_X_LPARAM(size); itemSize.x = GET_X_LPARAM(size);
itemSize.y = GET_Y_LPARAM(size); itemSize.y = GET_Y_LPARAM(size);
@ -292,10 +309,12 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
if (pdbi->dwMask & DBIM_BKCOLOR) if (pdbi->dwMask & DBIM_BKCOLOR)
pdbi->dwMask &= ~DBIM_BKCOLOR; pdbi->dwMask &= ~DBIM_BKCOLOR;
}
return S_OK; return S_OK;
} }
return E_FAIL;
}
/*****************************************************************************/ /*****************************************************************************/
// *** IDeskBar *** // *** IDeskBar ***
STDMETHODIMP CISFBand::SetClient(IN IUnknown *punkClient) STDMETHODIMP CISFBand::SetClient(IN IUnknown *punkClient)
@ -370,7 +389,7 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
STDMETHODIMP CISFBand::ContainsWindow(IN HWND hWnd) STDMETHODIMP CISFBand::ContainsWindow(IN HWND hWnd)
{ {
if (hWnd == m_hWndTb || ::IsChild(m_hWndTb, hWnd)) if (hWnd == m_hWnd || IsChild(hWnd))
{ {
TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); TRACE("CISFBand::ContainsWindow(0x%p) returns S_OK\n", hWnd);
return S_OK; return S_OK;
@ -388,7 +407,7 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd) STDMETHODIMP CISFBand::IsWindowOwner(HWND hWnd)
{ {
return (hWnd == m_hWndTb) ? S_OK : S_FALSE; return (hWnd == m_hWnd) ? S_OK : S_FALSE;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -426,18 +445,18 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
STDMETHODIMP CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl) STDMETHODIMP CISFBand::InitializeSFB(IShellFolder *psf, PCIDLIST_ABSOLUTE pidl)
{ {
LPITEMIDLIST pidlRoot; CComHeapPtr<ITEMIDLIST> pidlRoot;
SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidlRoot); SHGetSpecialFolderLocation(0, CSIDL_DESKTOP, &pidlRoot);
if (pidl == NULL || !psf->CompareIDs(0x80000000L, pidl, pidlRoot)) if (pidl == NULL || !psf->CompareIDs(0x80000000L, pidl, pidlRoot))
{ {
m_pISF = psf; m_pISF = psf;
m_pidl = pidl; m_pidl = ILClone(pidl);
} }
else else
{ {
psf->BindToObject(pidl, 0, IID_IShellFolder, (void**)&m_pISF); psf->BindToObject(pidl, 0, IID_PPV_ARG(IShellFolder, &m_pISF));
m_pidl = pidl; m_pidl = ILClone(pidl);
} }
return S_OK; return S_OK;
@ -491,10 +510,10 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
{ {
m_iconFlag = false; m_iconFlag = false;
HIMAGELIST* piml = (HIMAGELIST*) SendMessage(m_hWndTb, TB_GETIMAGELIST, 0, 0); HIMAGELIST* piml = (HIMAGELIST*) SendMessage(m_hWnd, TB_GETIMAGELIST, 0, 0);
HRESULT hr = SHGetImageList(SHIL_LARGE, IID_IImageList, (void**)&piml); HRESULT hr = SHGetImageList(SHIL_LARGE, IID_IImageList, (void**)&piml);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
SendMessage(m_hWndTb, TB_SETIMAGELIST, 0, (LPARAM)piml); SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml);
hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
break; break;
@ -503,10 +522,10 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
{ {
m_iconFlag = true; m_iconFlag = true;
HIMAGELIST* piml = (HIMAGELIST*)SendMessage(m_hWndTb, TB_GETIMAGELIST, 0, 0); HIMAGELIST* piml = (HIMAGELIST*)SendMessage(m_hWnd, TB_GETIMAGELIST, 0, 0);
HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml); HRESULT hr = SHGetImageList(SHIL_SMALL, IID_IImageList, (void**)&piml);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
SendMessage(m_hWndTb, TB_SETIMAGELIST, 0, (LPARAM)piml); SendMessage(m_hWnd, TB_SETIMAGELIST, 0, (LPARAM)piml);
hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
break; break;
@ -516,14 +535,14 @@ HWND CISFBand::CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst)
if (m_textFlag) if (m_textFlag)
{ {
m_textFlag = false; m_textFlag = false;
SendMessage(m_hWndTb, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); SendMessage(m_hWnd, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS);
HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
} }
else else
{ {
m_textFlag = true; m_textFlag = true;
SendMessage(m_hWndTb, TB_SETEXTENDEDSTYLE, 0, 0); SendMessage(m_hWnd, TB_SETEXTENDEDSTYLE, 0, 0);
HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL); HRESULT hr = IUnknown_Exec(m_Site, IID_IDeskBand, DBID_BANDINFOCHANGED, 0, NULL, NULL);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
} }

4
reactos/dll/shellext/qcklnch/CISFBand.h
View file

@ -26,8 +26,6 @@ class CISFBand :
CComPtr<IUnknown> m_Site; CComPtr<IUnknown> m_Site;
// Toolbar // Toolbar
HWND m_hWndTb;
HINSTANCE m_hInstance;
CComPtr<IShellFolder> m_pISF; CComPtr<IShellFolder> m_pISF;
PCIDLIST_ABSOLUTE m_pidl; PCIDLIST_ABSOLUTE m_pidl;
@ -41,7 +39,7 @@ public:
virtual ~CISFBand(); virtual ~CISFBand();
// Personal Methods // Personal Methods
HWND CreateSimpleToolbar(HWND hWndParent, HINSTANCE hInst); HRESULT CreateSimpleToolbar(HWND hWndParent);
LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnRButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

69
reactos/dll/shellext/qcklnch/CQuickLaunchBand.cpp
View file

@ -17,7 +17,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
HRESULT RegisterComCat() HRESULT RegisterComCat()
{ {
CComPtr<ICatRegister> pcr; CComPtr<ICatRegister> pcr;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**)&pcr); HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr));
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
CATID catid = CATID_DeskBand; CATID catid = CATID_DeskBand;
@ -29,7 +29,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
HRESULT UnregisterComCat() HRESULT UnregisterComCat()
{ {
CComPtr<ICatRegister> pcr; CComPtr<ICatRegister> pcr;
HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_ICatRegister, (void**)&pcr); HRESULT hr = CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(ICatRegister, &pcr));
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
CATID catid = CATID_DeskBand; CATID catid = CATID_DeskBand;
@ -41,8 +41,8 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Pidl Browser // Pidl Browser
LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL) LPITEMIDLIST PidlBrowse(HWND hwnd, int nCSIDL)
{ {
LPITEMIDLIST pidlRoot = NULL; CComHeapPtr<ITEMIDLIST> pidlRoot;
LPITEMIDLIST pidlSelected = NULL;
WCHAR path[MAX_PATH]; WCHAR path[MAX_PATH];
if (nCSIDL) if (nCSIDL)
@ -51,12 +51,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
} }
BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 }; BROWSEINFO bi = { hwnd, pidlRoot, path, L"Choose a folder", 0, NULL, 0, 0 };
pidlSelected = SHBrowseForFolder(&bi); LPITEMIDLIST pidlSelected = SHBrowseForFolder(&bi);
if (pidlRoot)
{
CoTaskMemFree(pidlRoot);
}
return pidlSelected; return pidlSelected;
} }
@ -72,21 +67,21 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
HRESULT CQuickLaunchBand::FinalConstruct() HRESULT CQuickLaunchBand::FinalConstruct()
{ {
HRESULT hr = CISFBand_CreateInstance(IID_IUnknown, (void**) &m_punkISFB); HRESULT hr = CISFBand_CreateInstance(IID_PPV_ARG(IUnknown, &m_punkISFB));
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
CComPtr<IShellFolderBand> pISFB; CComPtr<IShellFolderBand> pISFB;
hr = m_punkISFB->QueryInterface(IID_IShellFolderBand, (void**) &pISFB); hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IShellFolderBand, &pISFB));
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
CComPtr<IShellFolder> pISF; CComPtr<IShellFolder> pISF;
hr = SHGetDesktopFolder(&pISF); hr = SHGetDesktopFolder(&pISF);
if (FAILED_UNEXPECTEDLY(hr)) return hr; if (FAILED_UNEXPECTEDLY(hr)) return hr;
LPITEMIDLIST pidl = PidlBrowse(m_hWndBro, CSIDL_DESKTOP); CComHeapPtr<ITEMIDLIST> pidl(PidlBrowse(m_hWndBro, CSIDL_DESKTOP));
if (pidl == NULL) return E_FAIL; if (pidl == NULL) return E_FAIL;
pISFB->InitializeSFB(pISF, pidl); pISFB->InitializeSFB(pISF, pidl);
return hr; return hr;
} }
@ -97,7 +92,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IObjectWithSite> pIOWS; CComPtr<IObjectWithSite> pIOWS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IObjectWithSite, (void**)&pIOWS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIOWS->SetSite(pUnkSite); return pIOWS->SetSite(pUnkSite);
@ -109,7 +104,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IObjectWithSite> pIOWS; CComPtr<IObjectWithSite> pIOWS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IObjectWithSite, (void**)&pIOWS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pIOWS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIOWS->GetSite(riid, ppvSite); return pIOWS->GetSite(riid, ppvSite);
@ -121,7 +116,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->GetWindow(phwnd); return pIDB->GetWindow(phwnd);
@ -131,7 +126,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->ContextSensitiveHelp(fEnterMode); return pIDB->ContextSensitiveHelp(fEnterMode);
@ -141,7 +136,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->ShowDW(bShow); return pIDB->ShowDW(bShow);
@ -151,7 +146,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->CloseDW(dwReserved); return pIDB->CloseDW(dwReserved);
@ -161,7 +156,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved); return pIDB->ResizeBorderDW(prcBorder, punkToolbarSite, fReserved);
@ -173,7 +168,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBand> pIDB; CComPtr<IDeskBand> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBand, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBand, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi); return pIDB->GetBandInfo(dwBandID, dwViewMode, pdbi);
@ -187,7 +182,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBar> pIDB; CComPtr<IDeskBar> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->SetClient(punkClient); return pIDB->SetClient(punkClient);
@ -199,7 +194,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBar> pIDB; CComPtr<IDeskBar> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->GetClient(ppunkClient); return pIDB->GetClient(ppunkClient);
@ -211,7 +206,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IDeskBar> pIDB; CComPtr<IDeskBar> pIDB;
HRESULT hr = m_punkISFB->QueryInterface(IID_IDeskBar, (void**)&pIDB); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IDeskBar, &pIDB));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIDB->OnPosRectChangeDB(prc); return pIDB->OnPosRectChangeDB(prc);
@ -225,7 +220,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIPS->GetClassID(pClassID); return pIPS->GetClassID(pClassID);
@ -235,7 +230,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIPS->IsDirty(); return pIPS->IsDirty();
@ -247,7 +242,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIPS->Load(pStm); return pIPS->Load(pStm);
@ -257,7 +252,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIPS->Save(pStm, fClearDirty); return pIPS->Save(pStm, fClearDirty);
@ -269,7 +264,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IPersistStream> pIPS; CComPtr<IPersistStream> pIPS;
HRESULT hr = m_punkISFB->QueryInterface(IID_IPersistStream, (void**)&pIPS); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IPersistStream, &pIPS));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pIPS->GetSizeMax(pcbSize); return pIPS->GetSizeMax(pcbSize);
@ -294,7 +289,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IWinEventHandler> pWEH; CComPtr<IWinEventHandler> pWEH;
HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler, (void**)&pWEH); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); return pWEH->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
@ -304,7 +299,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IWinEventHandler> pWEH; CComPtr<IWinEventHandler> pWEH;
HRESULT hr = m_punkISFB->QueryInterface(IID_IWinEventHandler, (void**)&pWEH); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IWinEventHandler, &pWEH));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pWEH->IsWindowOwner(hWnd); return pWEH->IsWindowOwner(hWnd);
@ -316,7 +311,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IOleCommandTarget> pOCT; CComPtr<IOleCommandTarget> pOCT;
HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget, (void**)&pOCT); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText); return pOCT->QueryStatus(pguidCmdGroup, cCmds, prgCmds, pCmdText);
@ -326,7 +321,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IOleCommandTarget> pOCT; CComPtr<IOleCommandTarget> pOCT;
HRESULT hr = m_punkISFB->QueryInterface(IID_IOleCommandTarget, (void**)&pOCT); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IOleCommandTarget, &pOCT));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); return pOCT->Exec(pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut);
@ -338,7 +333,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax); return pICM->GetCommandString(idCmd, uFlags, pwReserved, pszName, cchMax);
@ -348,7 +343,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pICM->InvokeCommand(pici); return pICM->InvokeCommand(pici);
@ -358,7 +353,7 @@ static const GUID CLSID_QuickLaunchBand = { 0x260cb95d, 0x4544, 0x44f6, { 0xa0,
{ {
// Internal CISFBand Calls // Internal CISFBand Calls
CComPtr<IContextMenu> pICM; CComPtr<IContextMenu> pICM;
HRESULT hr = m_punkISFB->QueryInterface(IID_IContextMenu, (void**)&pICM); HRESULT hr = m_punkISFB->QueryInterface(IID_PPV_ARG(IContextMenu, &pICM));
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); return pICM->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags);