Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Improve DragEnter of CFSDropTarget (#2073)

Browse source 
Reduce failures of DragDrop testcase. CORE-11238
This commit is contained in:
Katayama Hirofumi MZ 2019-11-26 17:34:24 +09:00 committed by GitHub
parent d8187d33be
commit cd75a87cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
dll/win32/shell32/droptargets/CFSDropTarget.cpp
View file

@ -300,7 +300,41 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject,
m_fAcceptFmt = TRUE;
m_grfKeyState = dwKeyState;
m_dwDefaultEffect = DROPEFFECT_MOVE;
#define D_NONE DROPEFFECT_NONE
#define D_COPY DROPEFFECT_COPY
#define D_MOVE DROPEFFECT_MOVE
#define D_LINK DROPEFFECT_LINK
m_dwDefaultEffect = *pdwEffect;
switch (*pdwEffect & (D_COPY | D_MOVE | D_LINK))
{
case D_COPY | D_MOVE:
if (dwKeyState & MK_CONTROL)
m_dwDefaultEffect = D_COPY;
else
m_dwDefaultEffect = D_MOVE;
break;
case D_COPY | D_MOVE | D_LINK:
if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL))
m_dwDefaultEffect = D_LINK;
else if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == MK_CONTROL)
m_dwDefaultEffect = D_COPY;
else
m_dwDefaultEffect = D_MOVE;
break;
case D_COPY | D_LINK:
if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL))
m_dwDefaultEffect = D_LINK;
else
m_dwDefaultEffect = D_COPY;
break;
case D_MOVE | D_LINK:
if ((dwKeyState & (MK_SHIFT | MK_CONTROL)) == (MK_SHIFT | MK_CONTROL))
m_dwDefaultEffect = D_LINK;
else
m_dwDefaultEffect = D_MOVE;
break;
}
STGMEDIUM medium;
if (SUCCEEDED(pDataObject->GetData(&fmt2, &medium)))
@ -317,7 +351,11 @@ HRESULT WINAPI CFSDropTarget::DragEnter(IDataObject *pDataObject,
ReleaseStgMedium(&medium);
}
_QueryDrop(dwKeyState, pdwEffect);
if (!m_fAcceptFmt)
*pdwEffect = DROPEFFECT_NONE;
else
*pdwEffect = m_dwDefaultEffect;
return S_OK;
}