Changeset 1413

Timestamp:

Apr 24, 2009, 11:51:13 PM (17 years ago)

Author:

Gregg Young

Message:

Fixed select/deselect mask and filtering for wildcards without \ or / in them for archives with path names.

Location:

trunk/dll

Files:

• arccnrs.c (modified) (4 diffs)
• select.c (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -429 +429 @@
         if (*dcd->mask.pszMasks[x]) {
           if (*dcd->mask.pszMasks[x] != '/') {
-            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x], FALSE))
+            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x], TRUE))
               ret = TRUE;
           }
           else {
-            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x] + 1, FALSE)) {
+            if (wildcard(r->pszFileName, dcd->mask.pszMasks[x] + 1, TRUE)) {
               ret = FALSE;
               break;
@@ -442 +442 @@
     }
     else {
-      if (wildcard(r->pszFileName, dcd->mask.szMask, FALSE))
+      if (wildcard(r->pszFileName, dcd->mask.szMask, TRUE))
         ret = TRUE;
     }
@@ -1558 +1558 @@
           mask.fNoAttribs = TRUE;
           mask.fNoDirs = TRUE;
+          mask.fText = TRUE;
           strcpy(mask.prompt,
                  GetPString((SHORT1FROMMP(mp1) == IDM_SELECTMASK) ?
@@ -1570 +1571 @@
               DeselectAll(dcd->hwndCnr, TRUE, TRUE, mask.szMask, NULL, FALSE);
           }
-        }
+        }
+        break;
 
       case IDM_INVERT:

trunk/dll/select.c

@@ -229 +229 @@
               pszToMatch = file;
             if (*Mask.pszMasks[x] != '/') {
-              if (wildcard(pszToMatch, Mask.pszMasks[x], FALSE)) {
+              if (wildcard(pszToMatch, Mask.pszMasks[x], TRUE)) {
                 markit = TRUE;
               }
             }
             else {
-              if (wildcard(pszToMatch, Mask.pszMasks[x] + 1, FALSE)) {
+              if (wildcard(pszToMatch, Mask.pszMasks[x] + 1, TRUE)) {
                 markit = FALSE;
                 break;
@@ -333 +333 @@
               pszToMatch = file;
             if (*Mask.pszMasks[x] != '/') {
-              if (wildcard(pszToMatch, Mask.pszMasks[x], FALSE))
+              if (wildcard(pszToMatch, Mask.pszMasks[x], TRUE))
                 unmarkit = TRUE;
             }
             else {
-              if (wildcard(pszToMatch, Mask.pszMasks[x] + 1, FALSE)) {
+              if (wildcard(pszToMatch, Mask.pszMasks[x] + 1, TRUE)) {
                 unmarkit = FALSE;
                 break;