Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-08 12:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add stubs for TRASH_CanTrashFile and TRASH_TrashFile

Browse source 
svn path=/trunk/; revision=30087
This commit is contained in:
Hervé Poussineau 2007-11-03 13:39:55 +00:00
parent 495c4b799c
commit be299c8c04
3 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/dll/win32/shell32/recyclebin.c
View file

@ -796,3 +796,16 @@ BOOL SH_ShowRecycleBinProperties(WCHAR sDrive)
return TRUE;
}
BOOL
TRASH_CanTrashFile(LPCWSTR wszPath)
{
FIXME("(%s)\n", debugstr_w(wszPath));
return TRUE;
}
BOOL
TRASH_TrashFile(LPCWSTR wszPath)
{
FIXME("(%s)\n", debugstr_w(wszPath));
return FALSE;
}

26
reactos/dll/win32/shell32/shell32_ros.diff
View file

@ -1235,29 +1235,7 @@ Index: shlfileop.c
===================================================================
--- shlfileop.c (revision 29513)
+++ shlfileop.c (working copy)
@@ -1303,8 +1303,8 @@
return ERROR_SUCCESS;
/* Windows also checks only the first item */
- bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO)
- && TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath);
+ bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO);
+ //&& TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath);
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING))
if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))
@@ -1325,8 +1325,10 @@
if (bTrash)
{
BOOL bDelete;
+#if 0
if (TRASH_TrashFile(fileEntry->szFullPath))
continue;
+#endif
/* Note: Windows silently deletes the file in such a situation, we show a dialog */
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))
@@ -1696,16 +1698,6 @@
@@ -1696,16 +1696,6 @@
}
/***********************************************************************
@ -1274,7 +1252,7 @@ Index: shlfileop.c
* SHPathPrepareForWriteW (SHELL32.@)
*/
HRESULT WINAPI SHPathPrepareForWriteW(HWND hwnd, IUnknown *modless, LPCWSTR path, DWORD flags)
@@ -1767,3 +1759,13 @@
@@ -1767,3 +1757,13 @@
else
return HRESULT_FROM_WIN32(ERROR_DIRECTORY);
}

6
reactos/dll/win32/shell32/shlfileop.c
View file

@ -1303,10 +1303,8 @@ static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom)
return ERROR_SUCCESS;
/* Windows also checks only the first item */
bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO);
#if 0
bTrash = (lpFileOp->fFlags & FOF_ALLOWUNDO)
&& TRASH_CanTrashFile(flFrom->feFiles[0].szFullPath);
#endif
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (!bTrash && lpFileOp->fFlags & FOF_WANTNUKEWARNING))
if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, bTrash, flFrom))
@ -1327,10 +1325,8 @@ static HRESULT delete_files(LPSHFILEOPSTRUCTW lpFileOp, FILE_LIST *flFrom)
if (bTrash)
{
BOOL bDelete;
#if 0
if (TRASH_TrashFile(fileEntry->szFullPath))
continue;
#endif
/* Note: Windows silently deletes the file in such a situation, we show a dialog */
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))