[0.4.2] * Merge the shell fix by Giannis in r72026. CORE-11681

svn path=/branches/ros-branch-0_4_2/; revision=72027
This commit is contained in:
Amine Khaldi 2016-07-27 21:35:54 +00:00
parent 725e7bef25
commit 4165e2c6d2

View file

@ -1236,6 +1236,11 @@ HRESULT WINAPI CFSFolder::Drop(IDataObject *pDataObject,
{
TRACE("(%p) object dropped, effect %u\n", this, *pdwEffect);
if (!pdwEffect)
return E_INVALIDARG;
QueryDrop(dwKeyState, pdwEffect);
BOOL fIsOpAsync = FALSE;
CComPtr<IAsyncOperation> pAsyncOperation;