Changeset 1366

Timestamp:

Jan 1, 2009, 10:36:46 PM (17 years ago)

Author:

Gregg Young

Message:

Seek and scan called from the dir or drive context menu opens seek and scan and provides the path to start the search from. (Ticket 167)

Location:

trunk/dll

Files:

• collect.c (modified) (2 diffs)
• dircnrs.c (modified) (1 diff)
• fm3res.rc (modified) (1 diff)
• grep2.c (modified) (4 diffs)
• grep2.h (modified) (1 diff)
• treecnr.c (modified) (1 diff)

trunk/dll/collect.c

@@ -1383 +1383 @@
                MPVOID, MPFROM2SHORT(0, CMA_ERASE | CMA_REPOSITION));
     disable_menuitem(WinWindowFromID(WinQueryWindow(hwndMain, QW_PARENT),
-                                     FID_MENU), IDM_GREP, FALSE);
+                                     FID_MENU), IDM_GREP, FALSE);
+    disable_menuitem(TreeMenu, IDM_GREP, FALSE);
+    disable_menuitem(DirMenu, IDM_GREP, FALSE);
     PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
     if (dcd) {
@@ -1935 +1937 @@
                  "Collector busy - please try again later");
         }
-        else {
-          if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
-                        FM3ModHandle, GREP_FRAME, (PVOID) & hwnd)) {
-            dcd->amextracted = TRUE;    // Say busy scanning
-            disable_menuitem(WinWindowFromID
-                             (WinQueryWindow(hwndMain, QW_PARENT), FID_MENU),
-                             IDM_GREP, TRUE);
-            PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+        else {
+          GREPINFO *GrepInfo;
+
+          GrepInfo = xmallocz(sizeof(GREPINFO), pszSrcFile, __LINE__);
+          if (GrepInfo) {
+            GrepInfo->hwnd = &hwnd;
+            if (mp2)
+              GrepInfo->szGrepPath = mp2;
+            if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
+                          FM3ModHandle, GREP_FRAME, (PVOID) GrepInfo)) {
+              free(GrepInfo);
+              dcd->amextracted = TRUE;  // Say busy scanning
+              disable_menuitem(WinWindowFromID
+                               (WinQueryWindow(hwndMain, QW_PARENT), FID_MENU),
+                               IDM_GREP, TRUE);
+              disable_menuitem(TreeMenu, IDM_GREP, TRUE);
+              disable_menuitem(DirMenu, IDM_GREP, TRUE);
+              PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
+            }
+            else
+              free(GrepInfo);
           }
         }

trunk/dll/dircnrs.c

@@ -2146 +2146 @@
         }
         else
-          StartCollector(dcd->hwndParent, 4);
-        if (SHORT1FROMMP(mp1) == IDM_GREP)
-          PostMsg(Collector, WM_COMMAND,
-                  MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+          StartCollector(dcd->hwndParent, 4);
+        if (SHORT1FROMMP(mp1) == IDM_GREP) {
+          PCNRITEM pci = NULL;
+
+          pci = WinSendMsg(hwnd,
+                           CM_QUERYRECORDEMPHASIS,
+                           MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
+          if (pci && (INT) pci != -1)
+            PostMsg(Collector, WM_COMMAND,
+                    MPFROM2SHORT(IDM_GREP, 0), MPFROMP(pci->pszFileName));
+          else
+            PostMsg(Collector, WM_COMMAND,
+                    MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+        }
         else
           PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_COLLECTOR, 0), MPVOID);

trunk/dll/fm3res.rc

@@ -1343 +1343 @@
          MENUITEM "Si~zes...\tCtrl + z",IDM_SIZES
          MENUITEM "~Show all files...\tCtrl + G",IDM_SHOWALLFILES
+         MENUITEM "~Seek & scan files",IDM_GREP
          MENUITEM "~Undelete...",    IDM_UNDELETE
          MENUITEM "",                -1,       MIS_SEPARATOR

trunk/dll/grep2.c

@@ -188 +188 @@
   CHAR simple[8192];
   CHAR path[CCHMAXPATH];
+  GREPINFO *GrepInfo;
 
   static CHAR lastmask[8192] = "*";
@@ -200 +201 @@
   static BOOL findifany = TRUE;
   static BOOL gRemember = FALSE;
-  ULONG size = sizeof(BOOL);
+  ULONG size;
   static UINT newer = 0;
   static UINT older = 0;
@@ -212 +213 @@
       break;
     }
-    WinSetWindowULong(hwnd, QWL_USER, *(HWND *) mp2);
+    GrepInfo = mp2;
+    if (GrepInfo->szGrepPath)
+      BldFullPathName(lastmask, GrepInfo->szGrepPath, "*");
+    WinSetWindowULong(hwnd, QWL_USER, *(HWND *) GrepInfo->hwnd);
     WinSendDlgItemMsg(hwnd,
                       GREP_MASK,
@@ -232 +236 @@
     WinSetDlgItemText(hwnd, GREP_MASK, lastmask);
     WinSendDlgItemMsg(hwnd,
-                      GREP_MASK, EM_SETSEL, MPFROM2SHORT(0, 8192), MPVOID);
+                      GREP_MASK, EM_SETSEL, MPFROM2SHORT(0, 8192), MPVOID);
+    size = sizeof(BOOL);
     PrfQueryProfileData(fmprof, FM3Str, "RememberFlagsGrep",
                         (PVOID) & gRemember, &size);
     WinCheckButton(hwnd, GREP_REMEMBERFLAGS, gRemember);
     if (gRemember) {
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Recurse",
-                          (PVOID) & recurse, &size);
+                          (PVOID) & recurse, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Absolute",
-                          (PVOID) & absolute, &size);
+                          (PVOID) & absolute, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Case",
-                          (PVOID) & sensitive, &size);
+                          (PVOID) & sensitive, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Sayfiles",
-                          (PVOID) & sayfiles, &size);
+                          (PVOID) & sayfiles, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_Searchfiles",
-                          (PVOID) & searchFiles, &size);
+                          (PVOID) & searchFiles, &size);
+      size = sizeof(BOOL);
       PrfQueryProfileData(fmprof, FM3Str, "Grep_SearchfEAs",
                           (PVOID) & searchEAs, &size);

trunk/dll/grep2.h

@@ -18 +18 @@
 MRESULT EXPENTRY GrepDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 
+typedef struct {
+
+  HWND     *hwnd;
+  CHAR     *szGrepPath;
+  CHAR     *szGrepText;
+}
+GREPINFO;
+
 
 #endif // GREP2_H

trunk/dll/treecnr.c

@@ -2747 +2747 @@
         else
           StartCollector(dcd->hwndParent, 4);
-        if (SHORT1FROMMP(mp1) == IDM_GREP)
-          PostMsg(Collector, WM_COMMAND,
-                  MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+        if (SHORT1FROMMP(mp1) == IDM_GREP) {
+          PCNRITEM pci = NULL;
+
+          pci = WinSendMsg(hwnd,
+                           CM_QUERYRECORDEMPHASIS,
+                           MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
+          if (pci && (INT) pci != -1)
+            PostMsg(Collector, WM_COMMAND,
+                    MPFROM2SHORT(IDM_GREP, 0), MPFROMP(pci->pszFileName));
+          else
+            PostMsg(Collector, WM_COMMAND,
+                    MPFROM2SHORT(IDM_GREP, 0), MPVOID);
+        }
         else
         PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_COLLECTOR, 0), MPVOID);