Sync to trunk (r46918)

[reactos.git] / dll / win32 / shell32 / shv_def_cmenu.c

diff --git a/dll/win32/shell32/shv_def_cmenu.c b/dll/win32/shell32/shv_def_cmenu.c
index 71c25a7..08c9c3c 100644 (file)
--- a/dll/win32/shell32/shv_def_cmenu.c
+++ b/dll/win32/shell32/shv_def_cmenu.c
@@ -48,7 +48,7 @@ static LPIDefaultContextMenuImpl __inline impl_from_IContextMenu( IContextMenu2
 }
 
 VOID INewItem_SetCurrentShellFolder(IShellFolder * psfParent); // HACK
-
+WCHAR *build_paths_list(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls);
 
 static
 HRESULT
@@ -1297,12 +1297,12 @@ DoDelete(
     HRESULT hr;
     STRRET strTemp;
     WCHAR szPath[MAX_PATH];
+    LPWSTR wszPath, wszPos;
     SHFILEOPSTRUCTW op;
     int ret;
     LPSHELLBROWSER lpSB;
     HWND hwnd;
 
-
     hr = IShellFolder2_GetDisplayNameOf(This->dcm.psf, This->dcm.apidl[0], SHGDN_FORPARSING, &strTemp);
     if(hr != S_OK)
     {
@@ -1316,20 +1316,26 @@ DoDelete(
         ERR("StrRetToBufW failed with %x\n", hr);
         return hr;
     }
-    /* FIXME
-     * implement deletion with multiple files
-     */
+
+    /* Only keep the base path */
+    wszPos = strrchrW(szPath, '\\');
+    if (wszPos != NULL)
+    {
+        *(wszPos + 1) = '\0';
+    }
+
+    wszPath = build_paths_list(szPath, This->dcm.cidl, This->dcm.apidl);
 
     ZeroMemory(&op, sizeof(op));
     op.hwnd = GetActiveWindow();
     op.wFunc = FO_DELETE;
-    op.pFrom = szPath;
+    op.pFrom = wszPath;
     op.fFlags = FOF_ALLOWUNDO;
     ret = SHFileOperationW(&op);
 
     if (ret)
     {
-        TRACE("SHFileOperation failed with %0x%x", GetLastError());
+        ERR("SHFileOperation failed with 0x%x for %s\n", GetLastError(), debugstr_w(wszPath));
         return S_OK;
     }
 
@@ -1348,6 +1354,7 @@ DoDelete(
     }
     NotifyShellViewWindow(lpcmi, TRUE);
 
+    HeapFree(GetProcessHeap(), 0, wszPath);
     return S_OK;
 
 }