Skip to content

W
wine-winehq
Commit 31cd6b8c authored by Martin Fuchs's avatar Martin Fuchs Committed by Alexandre Julliard
Browse files
Options

- SHBindToParent(): request correct COM interface from desktop.

- _ILCreateFromFindDataA(): type cast to eliminate MSVC compiler warning.
parent 5f3f2149
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 4 deletions
dlls/shell32/pidl.c
View file @ 31cd6b8c
......@@ -1392,10 +1392,20 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI
if (_ILIsPidlSimple(pidl))
{
IShellFolder* desktop;
/* we are on desktop level */
if (ppidlLast)
*ppidlLast = ILClone(pidl);
hr = SHGetDesktopFolder((IShellFolder**)ppv);
hr = SHGetDesktopFolder(&desktop);
if (SUCCEEDED(hr))
{
hr = IShellFolder_QueryInterface(desktop, riid, ppv);
if (SUCCEEDED(hr) && ppidlLast)
*ppidlLast = ILClone(pidl);
IShellFolder_Release(desktop);
}
}
else
{
......@@ -1583,7 +1593,7 @@ LPITEMIDLIST _ILCreateFromFindDataA(WIN32_FIND_DATAA * stffile )
pData->type = type;
FileTimeToDosDateTime(&(stffile->ftLastWriteTime),&pData->u.folder.uFileDate,&pData->u.folder.uFileTime);
pData->u.folder.dwFileSize = stffile->nFileSizeLow;
pData->u.folder.uFileAttribs = stffile->dwFileAttributes;
pData->u.folder.uFileAttribs = (WORD)stffile->dwFileAttributes;
}
if ((pszDest = _ILGetTextPointer(pidl)))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment