Changeset 1366 for trunk/dll/collect.c

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)

File:

• trunk/dll/collect.c (modified) (2 diffs)

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);
           }
         }