[SHELL32]
* Move the IID_NULL_PPV_ARG macro to the shobj_undoc header, next to the (also ros-specific) IID_PPV_ARG macro, so that it can be used elsewhere.
[SHELL32]
* Make use of IID_NULL_PPV_ARG in all the calls to GetUIObjectOf, and fix one instance of mismatched riid/pointer.
CORE-7330
svn path=/branches/shell-experiments/; revision=63044
CComPtr<IContextMenu> contextMenu = NULL;
LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(dwData);
CComPtr<IContextMenu> contextMenu = NULL;
LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(dwData);
-#define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType)))
-
hr = m_shellFolder->GetUIObjectOf(GetToolbar(), 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &contextMenu));
if (FAILED_UNEXPECTEDLY(hr))
{
hr = m_shellFolder->GetUIObjectOf(GetToolbar(), 1, &pidl, IID_NULL_PPV_ARG(IContextMenu, &contextMenu));
if (FAILED_UNEXPECTEDLY(hr))
{
hr = SHGetDesktopFolder(&psfDesktop);
if (SUCCEEDED(hr))
hr = SHGetDesktopFolder(&psfDesktop);
if (SUCCEEDED(hr))
- hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_IShellFolder2, (void**) &psfRecycleBin);
+ hr = psfDesktop->BindToObject(pSimplePidl, NULL, IID_PPV_ARG(IShellFolder2, &psfRecycleBin));
if (SUCCEEDED(hr))
hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList);
if (SUCCEEDED(hr))
hr = psfRecycleBin->EnumObjects(NULL, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &EnumIDList);
if (SUCCEEDED(SHGetDesktopFolder(&dsf)))
{
if (SUCCEEDED(SHGetDesktopFolder(&dsf)))
{
- HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*)&pidl, IID_IShellLinkW, NULL, (LPVOID *)&psl);
+ HRESULT hr = dsf->GetUIObjectOf(NULL, 1, (LPCITEMIDLIST*) &pidl, IID_NULL_PPV_ARG(IShellLinkW, &psl));
TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small");
TRACE("sf=%p pidl=%p %s\n", sh, pidl, bBigIcon?"Big":"Small");
- if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_IExtractIconW, 0, (void **)&ei)))
+ if (SUCCEEDED (sh->GetUIObjectOf(0, 1, &pidl, IID_NULL_PPV_ARG(IExtractIconW, &ei))))
{
if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags)))
{
{
if (SUCCEEDED(ei->GetIconLocation(uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags)))
{
CComPtr<IDataObject> pDataObj;
HRESULT hr;
CComPtr<IDataObject> pDataObj;
HRESULT hr;
- hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple,
- IID_IDataObject, 0, (LPVOID*)&pDataObj);
+ hr = lpsf->GetUIObjectOf(0, 1, &pidlSimple, IID_NULL_PPV_ARG(IDataObject, &pDataObj));
if (SUCCEEDED(hr))
{
STGMEDIUM medium;
if (SUCCEEDED(hr))
{
STGMEDIUM medium;
/* get the iconlocation */
if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION ))
{
/* get the iconlocation */
if (SUCCEEDED(hr) && (flags & SHGFI_ICONLOCATION ))
{
if (flags & SHGFI_USEFILEATTRIBUTES)
{
if (flags & SHGFI_USEFILEATTRIBUTES)
{
else
{
hr = psfParent->GetUIObjectOf(0, 1,
else
{
hr = psfParent->GetUIObjectOf(0, 1,
- (LPCITEMIDLIST*)&pidlLast, IID_IExtractIconW,
- &uDummy, (LPVOID*)&pei);
+ (LPCITEMIDLIST*)&pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei));
if (SUCCEEDED(hr))
{
hr = pei->GetIconLocation(uGilFlags,
if (SUCCEEDED(hr))
{
hr = pei->GetIconLocation(uGilFlags,
{
CComPtr<IExtractIconA> pei;
{
CComPtr<IExtractIconA> pei;
- hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconA, NULL, (LPVOID*)&pei);
+ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconA, &pei));
if (SUCCEEDED(hr))
hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL);
if (SUCCEEDED(hr))
hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, NULL);
{
CComPtr<IExtractIconW> pei;
{
CComPtr<IExtractIconW> pei;
- hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IExtractIconW, NULL, (LPVOID*)&pei);
+ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IExtractIconW, &pei));
if (SUCCEEDED(hr))
hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags);
if (SUCCEEDED(hr))
hr = pei->GetIconLocation(0, pszIconPath, MAX_PATH, piIcon, &wFlags);
- hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IDropTarget, NULL, (LPVOID*)&mDropTarget);
+ hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_NULL_PPV_ARG(IDropTarget, &mDropTarget));
if (SUCCEEDED(hr))
hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect);
if (SUCCEEDED(hr))
hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect);
- shf->GetUIObjectOf(NULL, 1, &pidllast,
- IID_IDataObject, NULL, (LPVOID*) &dataobj);
+ shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IDataObject, &dataobj));
end:
if (pidl != sei->lpIDList)
end:
if (pidl != sei->lpIDList)
DWORD dwAttributes = SFGAO_CANLINK;
DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE;
DWORD dwAttributes = SFGAO_CANLINK;
DWORD dwEffect = DROPEFFECT_COPY | DROPEFFECT_MOVE;
- if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_IDataObject, 0, (LPVOID *)&pda)))
+ if (SUCCEEDED(m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, (LPCITEMIDLIST*)m_apidl, IID_NULL_PPV_ARG(IDataObject, &pda))))
{
IDropSource * pds = (IDropSource *)this; /* own DropSource interface */
{
IDropSource * pds = (IDropSource *)this; /* own DropSource interface */
SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
/* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */
SendMessageW(m_hWndList, LVM_GETITEMW, 0, (LPARAM) &lvItem);
/* ... and bind m_pCurDropTarget to the IDropTarget interface of an UIObject of this object */
- hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1,
- (LPCITEMIDLIST*)&lvItem.lParam, IID_IDropTarget, NULL, (LPVOID*)&m_pCurDropTarget);
+ hr = m_pSFParent->GetUIObjectOf(m_hWndList, 1, (LPCITEMIDLIST*)&lvItem.lParam, IID_NULL_PPV_ARG(IDropTarget, &m_pCurDropTarget));
}
/* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */
}
/* If anything failed, m_pCurDropTarget should be NULL now, which ought to be a save state. */
#endif /* defined(__cplusplus) */
#ifdef __cplusplus
#endif /* defined(__cplusplus) */
#ifdef __cplusplus
-#define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType)))
+# define IID_PPV_ARG(Itype, ppType) IID_##Itype, reinterpret_cast<void**>((static_cast<Itype**>(ppType)))
+# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, reinterpret_cast<void**>((static_cast<Itype**>(ppType)))
-#define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType)
+# define IID_PPV_ARG(Itype, ppType) IID_##Itype, (void**)(ppType)
+# define IID_NULL_PPV_ARG(Itype, ppType) IID_##Itype, NULL, (void**)(ppType)
#endif
/*****************************************************************************
#endif
/*****************************************************************************