[PATCH 2/4] shell32: Get rid of a helper function.

[Michael Stefaniuc]

---
 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;
 }
-- 
1.7.6.5