Changeset 1041 for trunk/dll/dircnrs.c

Timestamp:

Jul 7, 2008, 1:30:30 AM (17 years ago)

Author:

Gregg Young

Message:

Adds optional support for delete being move to X/Eworkplace trashcan (ticket 43)

File:

• trunk/dll/dircnrs.c (modified) (4 diffs)

trunk/dll/dircnrs.c

@@ -40 +40 @@
   21 Jun 08 GKY Fix columns to honor preferences on new container open.
   22 Jun 08 GKY Included free_... functions for fortify checking
+  06 Jul 08 GKY Update delete/undelete to include move to and open XWP trashcan
 
 ***********************************************************************/
@@ -53 +54 @@
 #define INCL_DOSERRORS
 #define INCL_LONGLONG
+#define INCL_WINWORKPLACE
 
 #include "fm3dlg.h"
@@ -2035 +2037 @@
         {
           PCNRITEM pci;
-          CHAR path[CCHMAXPATH];
-
-          pci = (PCNRITEM) CurrentRecord(hwnd);
-          if (pci && (INT) pci != -1) {
-            strcpy(path, pci->pszFileName);
-            MakeValidDir(path);
-            WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
-                      UNDEL_FRAME, MPFROMP(path));
+          CHAR path[CCHMAXPATH];
+          HOBJECT hObject;
+          HWND hwndDesktop;
+
+          hObject = WinQueryObject("<XWP_TRASHCAN>");
+          if (hObject != NULLHANDLE && fTrashCan) {
+            hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+            WinSetFocus(HWND_DESKTOP, hwndDesktop);
+            WinOpenObject(hObject, 0, TRUE);
+          }
+          else {
+            pci = (PCNRITEM) CurrentRecord(hwnd);
+            if (pci && (INT) pci != -1) {
+              strcpy(path, pci->pszFileName);
+              MakeValidDir(path);
+              WinDlgBox(HWND_DESKTOP, hwnd, UndeleteDlgProc, FM3ModHandle,
+                        UNDEL_FRAME, MPFROMP(path));
+            }
           }
         }
@@ -2048 +2060 @@
 
       case IDM_UNDELETESPEC:
-        WinDlgBox(HWND_DESKTOP,
-                  hwnd,
-                  UndeleteDlgProc,
-                  FM3ModHandle, UNDEL_FRAME, MPFROMP(dcd->directory));
-        break;
+        {
+          HOBJECT hObject;
+          HWND hwndDesktop;
+
+          hObject = WinQueryObject("<XWP_TRASHCAN>");
+          if (hObject != NULLHANDLE && fTrashCan) {
+            hwndDesktop = WinQueryDesktopWindow((HAB) 0, NULLHANDLE);
+            WinSetFocus(HWND_DESKTOP, hwndDesktop);
+            WinOpenObject(hObject, 0, TRUE);
+          }
+        else
+          WinDlgBox(HWND_DESKTOP,
+                    hwnd,
+                    UndeleteDlgProc,
+                    FM3ModHandle, UNDEL_FRAME, MPFROMP(dcd->directory));
+        }
+        break;
 
       case IDM_RESORT: