Changeset 1768 for trunk/dll/arccnrs.c

Timestamp:

Mar 30, 2014, 7:37:05 PM (11 years ago)

Author:

Gregg Young

Message:

Last try to keep fix for Ticket 502. If it doesn't work need to revert FillArcCnr to 1747

File:

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

trunk/dll/arccnrs.c

@@ -581 +581 @@
 //== FillArcCnr() generate archive content list and fill container window ==
 
-static INT FillArcCnr(HWND hwndCnr, CHAR * arcname, ARC_TYPE ** arcinfo, /*FOLD00*/
+static INT FillArcCnr(HWND hwndCnr, CHAR * arcname, ARC_TYPE ** arcinfo,
                       ULONGLONG * pullTotalBytes, volatile PCHAR pStopFlag)
 {
@@ -589 +589 @@
   CHAR lonename[CCHMAXPATH + 2],
        *nsize, *osize, *fdate, *fname, *p, *pp, *arctemp;
-  CHAR TestStr[CCHMAXPATH * 2];
+  // Change the DosQueryAppType call below to xDosQueryAppType if "s" is no longer in low memory
   CHAR s[CCHMAXPATH * 2];
+  CHAR TestStr[CCHMAXPATH * 2]; 
   BOOL gotstart;
   BOOL gotend;
@@ -596 +597 @@
   BOOL nomove = FALSE;                  // fixme to be gone?
   BOOL notest;
-  BOOL nobzip, ftarbz, nogzip, ftargz;
   INT highest = 0, fieldnum, counter = 0, numarcfiles = 0;
   PARCITEM lastpai;
@@ -604 +604 @@
   APIRET rc;
   CHAR *mode;
-  ULONG cnter = 0;
+  ULONG cnter = 0; 
 
   if (!arcname || !arcinfo)
@@ -620 +620 @@
            ArcTempRoot);
   MakeTempName(arctemp, ArcTempRoot, 2);
-  p = strrchr(arcname, '.');
-  if (p) {
-    APIRET temp;
-
-    p = p - 3;
-    nobzip = stricmp(p, "TAR.BZ");
-    nogzip = stricmp(p, "TAR.GZ");
-    if (!nobzip) {
-      ftarbz = TRUE;
-      if (DosQueryAppType("bzip2.exe" , &apptype)) {
-        nobzip = TRUE;
-        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;
-      if (DosQueryAppType("gzip.exe" , &apptype)) {
-        nogzip = TRUE;
-        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));
-          }
-        }
-      }
-    }
-  }
+
 
 ReTry:
@@ -742 +699 @@
           }
           else {
-            rc = 0;
-            //DbgMsg(pszSrcFile, __LINE__, "Number of tries %i", cnter);
-            rc = SearchPathForFile(PCSZ_PATH, s, NULL);
-            if (!rc) {
-              cnter ++;
+            rc = 0; 
+            //DbgMsg(pszSrcFile, __LINE__, "Number of tries %i", cnter);
+            rc = SearchPathForFile(PCSZ_PATH, s, NULL);
+            if (!rc) {
+              cnter ++;
               runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
                       hwndCnr, pszSrcFile, __LINE__, NULL, NULL,
@@ -752 +709 @@
                       info->list,
                       BldQuotedFileName(s, arcname));
-              if (cnter == 1) {
+              if (cnter == 1) { 
                 if (info->test)
                   strcpy(TestStr, info->test);
@@ -764 +721 @@
                 notest = FALSE;
               }
-            }
-            oldstdout = fileno(stdout);
-            DosError(FERR_DISABLEHARDERR);
-            DosDupHandle(newstdout, &oldstdout);
-            DosClose(newstdout);
-            fclose(fp);
-          }
+            }
+            oldstdout = fileno(stdout);
+            DosError(FERR_DISABLEHARDERR);
+            DosDupHandle(newstdout, &oldstdout);
+            DosClose(newstdout);
+            fclose(fp);
+          }
         }
       }
@@ -967 +924 @@
 
       fclose(fp);
-      //DbgMsg(pszSrcFile, __LINE__, "Archive check counter %i numarcfiles %i gotstart %i %c",
-      //       cnter, numarcfiles, gotstart, pStopFlag);
+
       if (*pStopFlag)
         numarcfiles = 0;                // Request close
@@ -978 +934 @@
         CHAR errstr[CCHMAXPATH + 256];
 
-        // Try for alternate archiver
+        // Try for alternate archiver
         tinfo = info;
         do {
@@ -993 +949 @@
         if (!fAlertBeepOff)
           DosBeep(750, 50);             // wake up user
-        if (cnter > 0) {
+
+        if (cnter > 0) { 
           CHAR Temp[CCHMAXPATH + 2];
 
@@ -1001 +958 @@
                   !numarcfiles ? GetPString(IDS_NOARCFILESFOUNDTEXT) : NullStr,
                   !gotend ? GetPString(IDS_NOENDOFLISTTEXT) : NullStr,
-                  !notest ? NullStr : GetPString(IDS_ARCNOTEST),
-                  ftarbz && !nobzip ? GetPString(IDS_ARCBZIPTESTTARBZ) : NullStr,
-                  ftargz && !nogzip ? GetPString(IDS_ARCGZIPTESTTARGZ) : NullStr);
+                  !notest ? NullStr : GetPString(IDS_ARCNOTEST));
           memset(&ad, 0, sizeof(ARCDUMP));
-          ad.info = info;                                                   
-          strcpy(ad.listname, arctemp);                                     
-          strcpy(ad.arcname, arcname);                                      
-          if (!notest) {
+          ad.info = info;
+          strcpy(ad.listname, arctemp);
+          strcpy(ad.arcname, arcname);
+          if (!notest) { 
             strcpy(Temp, info->test);
             info->test = xstrdup(TestStr, pszSrcFile, __LINE__);
           }
-          else if ((ftarbz && !nobzip) || (ftargz && !nogzip))
-            info->test = xstrdup(ftarbz ? "bzip2.exe -t" : "gzip.exe - t",
-                                 pszSrcFile, __LINE__);
           else if (rc) {
             strcpy(Temp, info->test);
@@ -1023 +975 @@
                     hwndCnr,
                     ArcErrProc, FM3ModHandle, ARCERR_FRAME, MPFROMP(&ad));
-          if (!notest)
-            info->test = xstrdup(Temp, pszSrcFile, __LINE__);
-          else if ((ftarbz && !nobzip) || (ftargz && !nogzip))
-            info->test = xstrdup("", pszSrcFile, __LINE__);
-          else if (rc)
+          if (!notest || rc)
             info->test = xstrdup(Temp, pszSrcFile, __LINE__);
         }
-        else
-          saymsg(MB_OK, HWND_DESKTOP, GetPString(IDS_ARCMISSINGEXE),
+        else 
+          saymsg(MB_OK, HWND_DESKTOP, GetPString(IDS_ARCMISSINGEXE),
                  GetPString(IDS_ARCMISSINGEXEVERBOSE));
       }
       else if (!nomove && tinfo) {
-        // if we got a false hit, move working hit to top                   
-        tinfo = info->next;                                                 
+        // if we got a false hit, move working hit to top
+        tinfo = info->next;
         info->next = arcsighead;
         arcsighead->prev = info;
@@ -1057 +1005 @@
 
   return numarcfiles;
-}
-
+} // FillArcCnr
 MRESULT EXPENTRY ArcTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) /*FOLD00*/
 {