[ros-diffs] [janderwald] 30156: - call SHEmptyRecycleBinW on request - store first cmdindex of first shell extension - empty bitbucket should now work, although it gives back an error - thnx to hpoussin

[janderwald at svn.reactos.org]

Author: janderwald
Date: Mon Nov  5 12:57:30 2007
New Revision: 30156

URL: http://svn.reactos.org/svn/reactos?rev=30156&view=rev
Log:
- call SHEmptyRecycleBinW on request
- store first cmdindex of first shell extension
- empty bitbucket should now work, although it gives back an error
- thnx to hpoussin

Modified:
    trunk/reactos/dll/win32/shell32/recyclebin.c
    trunk/reactos/dll/win32/shell32/shv_item_cmenu.c

Modified: trunk/reactos/dll/win32/shell32/recyclebin.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/recyclebin.c?rev=30156&r1=30155&r2=30156&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/recyclebin.c (original)
+++ trunk/reactos/dll/win32/shell32/recyclebin.c Mon Nov  5 12:57:30 2007
@@ -726,7 +726,15 @@
 
     TRACE("%p %p verb %p\n", This, lpici, lpici->lpVerb);
 
-    if ( lpici->lpVerb == MAKEINTRESOURCEA(This->iIdProperties))
+    if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdEmpty))
+    {
+        // FIXME
+        // path & flags
+        return SHEmptyRecycleBinW(lpici->hwnd, L"C:\\", 0);
+    }
+
+
+    if ( LOWORD(lpici->lpVerb) == MAKEINTRESOURCEA(This->iIdProperties))
     {
        WCHAR szDrive = 'C';
        SH_ShowRecycleBinProperties(szDrive);

Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item_cmenu.c?rev=30156&r1=30155&r2=30156&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original)
+++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Mon Nov  5 12:57:30 2007
@@ -361,6 +361,7 @@
     }
 
     curEntry = This->dhead;
+    This->iIdSHEFirst = idCmdFirst;
     do
     {