[PATCH 2/4] shell32: Remove the no longer used ISFHelper::CopyItems() helper.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/shell32/recyclebin.c  |  8 ------
 dlls/shell32/shellfolder.h |  2 --
 dlls/shell32/shfldr_fs.c   | 55 --------------------------------------
 3 files changed, 65 deletions(-)

diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c
index 91f13413dce..b6d9879fa39 100644
--- a/dlls/shell32/recyclebin.c
+++ b/dlls/shell32/recyclebin.c
@@ -1200,13 +1200,6 @@ static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl,
     return erase_items(GetActiveWindow(),apidl,cidl,TRUE);
 }

-static HRESULT WINAPI RecycleBin_CopyItems(ISFHelper * iface,
-                                           IShellFolder * pSFFrom,
-                                           UINT cidl, LPCITEMIDLIST * apidl)
-{
-    return E_NOTIMPL;
-}
-
 static const ISFHelperVtbl sfhelperVtbl =
 {
     RecycleBin_ISFHelper_QueryInterface,
@@ -1215,7 +1208,6 @@ static const ISFHelperVtbl sfhelperVtbl =
     RecycleBin_GetUniqueName,
     RecycleBin_AddFolder,
     RecycleBin_DeleteItems,
-    RecycleBin_CopyItems
 };

HRESULT WINAPI SHQueryRecycleBinA(LPCSTR pszRootPath, LPSHQUERYRBINFO pSHQueryRBInfo)
diff --git a/dlls/shell32/shellfolder.h b/dlls/shell32/shellfolder.h
index 942e0e7ea28..da3e7b568e6 100644
--- a/dlls/shell32/shellfolder.h
+++ b/dlls/shell32/shellfolder.h
@@ -49,7 +49,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown)
     STDMETHOD(GetUniqueName)(THIS_ LPWSTR  lpName, UINT  uLen) PURE;
     STDMETHOD(AddFolder)(THIS_ HWND  hwnd, LPCWSTR  lpName, LPITEMIDLIST * ppidlOut) PURE;
     STDMETHOD(DeleteItems)(THIS_ UINT  cidl, LPCITEMIDLIST * apidl) PURE;
-    STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT  cidl, LPCITEMIDLIST * apidl) PURE;
 };
 #undef INTERFACE

@@ -62,7 +61,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown)
 #define ISFHelper_GetUniqueName(p,a,b)          (p)->lpVtbl->GetUniqueName(p,a,b)
 #define ISFHelper_AddFolder(p,a,b,c)            (p)->lpVtbl->AddFolder(p,a,b,c)
 #define ISFHelper_DeleteItems(p,a,b)            (p)->lpVtbl->DeleteItems(p,a,b)
-#define ISFHelper_CopyItems(p,a,b,c)            (p)->lpVtbl->CopyItems(p,a,b,c)
 #endif

#endif /* __WINE_SHELLFOLDER_HELP_H */
diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c
index 54828f99acc..808b20c9cae 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -1314,60 +1314,6 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl)
     return ret;
 }

-/****************************************************************************
- * ISFHelper_fnCopyItems
- *
- * copies items to this folder
- */
-static HRESULT WINAPI
-ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl,
-                       LPCITEMIDLIST * apidl)
-{
-    HRESULT ret=E_FAIL;
-    IPersistFolder2 *ppf2 = NULL;
-    WCHAR wszSrcPathRoot[MAX_PATH],
-      wszDstPath[MAX_PATH+1];
-    WCHAR *wszSrcPathsList;
-    IGenericSFImpl *This = impl_from_ISFHelper(iface);
-
-    SHFILEOPSTRUCTW fop;
-
-    TRACE ("(%p)->(%p,%u,%p)\n", This, pSFFrom, cidl, apidl);
-
-    IShellFolder_QueryInterface (pSFFrom, &IID_IPersistFolder2,
-     (LPVOID *) & ppf2);
-    if (ppf2) {
-        LPITEMIDLIST pidl;
-
-        if (SUCCEEDED (IPersistFolder2_GetCurFolder (ppf2, &pidl))) {
-            SHGetPathFromIDListW (pidl, wszSrcPathRoot);
-            if (This->sPathTarget)
-                lstrcpynW(wszDstPath, This->sPathTarget, MAX_PATH);
-            else
-                wszDstPath[0] = 0;
-            PathAddBackslashW(wszSrcPathRoot);
-            PathAddBackslashW(wszDstPath);
-            wszSrcPathsList = build_paths_list(wszSrcPathRoot, cidl, apidl);
-            ZeroMemory(&fop, sizeof(fop));
-            fop.hwnd = GetActiveWindow();
-            fop.wFunc = FO_COPY;
-            fop.pFrom = wszSrcPathsList;
-            fop.pTo = wszDstPath;
-            fop.fFlags = FOF_ALLOWUNDO;
-            ret = S_OK;
-            if(SHFileOperationW(&fop))
-            {
-                WARN("Copy failed\n");
-                ret = E_FAIL;
-            }
-            free(wszSrcPathsList);
-        }
-        SHFree(pidl);
-        IPersistFolder2_Release(ppf2);
-    }
-    return ret;
-}
-
 static const ISFHelperVtbl shvt =
 {
     ISFHelper_fnQueryInterface,
@@ -1376,7 +1322,6 @@ static const ISFHelperVtbl shvt =
     ISFHelper_fnGetUniqueName,
     ISFHelper_fnAddFolder,
     ISFHelper_fnDeleteItems,
-    ISFHelper_fnCopyItems
 };

/************************************************************************