[ros-diffs] [hpoussin] 30087: Add stubs for TRASH_CanTrashFile and TRASH_TrashFile
hpoussin at svn.reactos.org
hpoussin at svn.reactos.org
Sat Nov 3 14:39:56 CET 2007
Author: hpoussin
Date: Sat Nov 3 16:39:55 2007
New Revision: 30087
URL: http://svn.reactos.org/svn/reactos?rev=30087&view=rev
Log:
Add stubs for TRASH_CanTrashFile and TRASH_TrashFile
Modified:
trunk/reactos/dll/win32/shell32/recyclebin.c
trunk/reactos/dll/win32/shell32/shell32_ros.diff
trunk/reactos/dll/win32/shell32/shlfileop.c
Modified: trunk/reactos/dll/win32/shell32/recyclebin.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recyclebin.c?rev=30087&r1=30086&r2=30087&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/recyclebin.c (original)
+++ trunk/reactos/dll/win32/shell32/recyclebin.c Sat Nov 3 16:39:55 2007
@@ -796,3 +796,16 @@
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;
+}
Modified: trunk/reactos/dll/win32/shell32/shell32_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_ros.diff?rev=30087&r1=30086&r2=30087&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shell32_ros.diff (original)
+++ trunk/reactos/dll/win32/shell32/shell32_ros.diff Sat Nov 3 16:39:55 2007
@@ -1235,29 +1235,7 @@
===================================================================
--- 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 @@
* 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);
}
Modified: trunk/reactos/dll/win32/shell32/shlfileop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileop.c?rev=30087&r1=30086&r2=30087&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shlfileop.c (original)
+++ trunk/reactos/dll/win32/shell32/shlfileop.c Sat Nov 3 16:39:55 2007
@@ -1303,10 +1303,8 @@
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 @@
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))
More information about the Ros-diffs
mailing list