Changeset 1753 for trunk/dll/arccnrs.c

Timestamp:

Mar 2, 2014, 7:58:53 PM (11 years ago)

Author:

Gregg Young

Message:

Fixed typo that reversed the function of the saymsg dialog g/bzip check. Added option to suppress message regarding missing bzip2.exe or gzip.exe on TAR.B/GZ archives. Ticket 526

File:

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

trunk/dll/arccnrs.c

@@ -626 +626 @@
     if (!nobzip) {
       ftarbz = TRUE;
-      if (DosQueryAppType("bzip.exe" , &apptype)) {
+      if (DosQueryAppType("bzip2.exe" , &apptype)) {
         nobzip = TRUE;
-        temp = saymsg(MB_YESNO, HWND_DESKTOP, NullStr, GetPString(IDS_ARCNOBZIP));
-        if (temp != MBID_NO)
-          return 0;                                               
+        if (!fDontAskBzip) {
+          temp = saymsg2(NULL, 3,
+                         HWND_DESKTOP,
+                         NullStr,
+                         GetPString(IDS_ARCNOBZIP));
+          if (temp == SM2_NO ||temp == SM2_CANCEL)
+            return 0;
+          else if (temp == SM2_DONTASK) {
+            fDontAskBzip = TRUE;
+            PrfWriteProfileData(fmprof, FM3Str, "DontAskBzip", &fDontAskBzip, sizeof(BOOL));
+          }
+        }
       }                                                           
     }                                                             
-    else if (!nogzip) {                                           
-      ftargz = TRUE;                                              
+    else if (!nogzip) {
+      ftargz = TRUE;
       if (DosQueryAppType("gzip.exe" , &apptype)) {
         nogzip = TRUE;
-        temp = saymsg(MB_YESNO, HWND_DESKTOP, NullStr, GetPString(IDS_ARCNOGZIP));
-        if (temp != MBID_NO)
-          return 0;
+        if (!fDontAskGzip) {
+          temp = saymsg2(NULL, 3,
+                         HWND_DESKTOP,
+                         NullStr,
+                         GetPString(IDS_ARCNOGZIP));
+          if (temp == SM2_NO || temp == SM2_CANCEL)
+            return 0;
+          else if (temp == SM2_DONTASK) {
+            fDontAskGzip = TRUE;
+            PrfWriteProfileData(fmprof, FM3Str, "DontAskGzip", &fDontAskGzip, sizeof(BOOL));
+          }
+        }
       }
     }
@@ -734 +752 @@
                 if (info->test)
                   strcpy(TestStr, info->test);
-                else
+                else {
+                  strcpy(TestStr, "");
                   notest = TRUE;
+                }
               }
               else if (notest && info->test) {
@@ -990 +1010 @@
           }
           else if ((ftarbz && !nobzip) || (ftargz && !nogzip))
-            info->test = xstrdup(ftarbz ? "bzip.exe -t" : "gzip.exe - t",
+            info->test = xstrdup(ftarbz ? "bzip2.exe -t" : "gzip.exe - t",
                                  pszSrcFile, __LINE__);
+          else if (rc) {
+            strcpy(Temp, info->test);
+            info->test = NULL;
+          }
           ad.errmsg = errstr;
           WinDlgBox(HWND_DESKTOP,
@@ -1000 +1024 @@
           else if ((ftarbz && !nobzip) || (ftargz && !nogzip))
             info->test = xstrdup("", pszSrcFile, __LINE__);
+          else if (rc)
+            info->test = xstrdup(Temp, pszSrcFile, __LINE__);
         }
         else