X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=dll%2Fwin32%2Fshell32%2Fpidl.cpp;h=7f877b99ba2231e33cf626e3681fb0f876ae14ec;hp=7b7e490829f9ebdfff1517d024df30299418d2d6;hb=7ddd2648be4d4d4495928692da95600e62c08741;hpb=538011301663df17c3b12b5c57e75ca80ffebb3d diff --git a/dll/win32/shell32/pidl.cpp b/dll/win32/shell32/pidl.cpp index 7b7e490829f..7f877b99ba2 100644 --- a/dll/win32/shell32/pidl.cpp +++ b/dll/win32/shell32/pidl.cpp @@ -686,8 +686,7 @@ HRESULT WINAPI SHGetRealIDL(LPSHELLFOLDER lpsf, LPCITEMIDLIST pidlSimple, LPITEM CComPtr 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; @@ -754,11 +753,13 @@ EXTERN_C LPITEMIDLIST WINAPI SHLogILFromFSIL(LPITEMIDLIST pidl) */ UINT WINAPI ILGetSize(LPCITEMIDLIST pidl) { - LPCSHITEMID si = &(pidl->mkid); + LPCSHITEMID si; UINT len = 0; if (pidl) { + si = &(pidl->mkid); + while (si->cb) { len += si->cb;