Michael Stefaniuc : shell32: Get rid of a helper function.
Alexandre Julliard
julliard at winehq.org
Wed Feb 27 14:41:57 CST 2013
Module: wine
Branch: master
Commit: 00a20667fa3437c851bdf0e46ec5ff08c47d122e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=00a20667fa3437c851bdf0e46ec5ff08c47d122e
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Feb 26 23:35:00 2013 +0100
shell32: Get rid of a helper function.
---
dlls/shell32/shfldr_fs.c | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index f52c192..516750d 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -1612,27 +1612,6 @@ static const IPersistFolder3Vtbl pfvt =
/****************************************************************************
* ISFDropTarget implementation
*/
-static BOOL
-ISFDropTarget_QueryDrop (IDropTarget * iface, DWORD dwKeyState,
- LPDWORD pdwEffect)
-{
- DWORD dwEffect = *pdwEffect;
-
- IGenericSFImpl *This = impl_from_IDropTarget(iface);
-
- *pdwEffect = DROPEFFECT_NONE;
-
- if (This->fAcceptFmt) { /* Does our interpretation of the keystate ... */
- *pdwEffect = KeyStateToDropEffect (dwKeyState);
-
- /* ... matches the desired effect ? */
- if (dwEffect & *pdwEffect) {
- return TRUE;
- }
- }
- return FALSE;
-}
-
static HRESULT WINAPI
ISFDropTarget_QueryInterface (IDropTarget * iface, REFIID riid, LPVOID * ppvObj)
{
@@ -1673,7 +1652,10 @@ ISFDropTarget_DragEnter (IDropTarget * iface, IDataObject * pDataObject,
InitFormatEtc (fmt, This->cfShellIDList, TYMED_HGLOBAL);
This->fAcceptFmt = IDataObject_QueryGetData (pDataObject, &fmt) == S_OK;
- ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect);
+ if (This->fAcceptFmt)
+ *pdwEffect = KeyStateToDropEffect(dwKeyState);
+ else
+ *pdwEffect = DROPEFFECT_NONE;
return S_OK;
}
@@ -1689,7 +1671,10 @@ ISFDropTarget_DragOver (IDropTarget * iface, DWORD dwKeyState, POINTL pt,
if (!pdwEffect)
return E_INVALIDARG;
- ISFDropTarget_QueryDrop (iface, dwKeyState, pdwEffect);
+ if (This->fAcceptFmt)
+ *pdwEffect = KeyStateToDropEffect(dwKeyState);
+ else
+ *pdwEffect = DROPEFFECT_NONE;
return S_OK;
}
More information about the wine-cvs
mailing list