Changeset 1690 for trunk/dll

Timestamp:

Aug 5, 2013, 2:13:41 AM (12 years ago)

Author:

Gregg Young

Message:

Changes to fix .tar.gz list because of changes in tar 1.20 (maybe earlier). Added lzip support with ungly hack to work around its lack of a list option. Tickets 493, 494

Location:

trunk/dll

Files:

• arccnrs.c (modified) (2 diffs)
• defview.c (modified) (1 diff)
• filldir.c (modified) (1 diff)
• fm3res.rc (modified) (1 diff)
• fm3str.h (modified) (1 diff)

trunk/dll/arccnrs.c

@@ -885 +885 @@
         numarcfiles = 0;                // Request close
       else if (!numarcfiles || !gotstart
-               || (!gotend && info->endlist && *info->endlist && (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
+               || (!gotend && info->endlist && *info->endlist &&
+                   (stricmp(info->endlist, NO_END_OF_ARCHIVER_LIST_STRING)))) {
         // Oops
         ARCDUMP ad;
@@ -3599 +3600 @@
   static USHORT idinc = 0;
 
+
+  if (!strcmp(strupr(strrchr(arcname, '.') + 1), "LZ")) {
+      saymsg(MB_ENTER | MB_ICONASTERISK, HWND_DESKTOP, GetPString(IDS_LZIPLIMITATION),
+             GetPString(IDS_LZIPNOLIST));
+    return -1;
+  }
+
   if (!idinc)
     idinc = (rand() % 256);

trunk/dll/defview.c

@@ -302 +302 @@
                            strcmp(realappname, FM3Str)) ?
                           HWND_DESKTOP :
-                          hwndParent, hwndFrame, filename, 4, NULL);
+                          hwndParent, hwndFrame, filename, 4, NULL);
+    if (hwndArc == -1)
+      return;
+
     if (!hwndArc) {
       if (!IsExecutable(filename) || !ExecFile(hwnd, filename)) {

trunk/dll/filldir.c

@@ -324 +324 @@
              cmp == *(ULONG *) ".GZ"  || cmp == *(ULONG *) ".Z"   ||
              cmp == *(ULONG *) ".CAB" || cmp == *(ULONG *) ".BZ2" ||
-             cmp == *(ULONG *) ".WPI")
+             cmp == *(ULONG *) ".WPI" || cmp == *(ULONG *) ".7Z")
       hptr = hptrArc;
     else if (cmp == *(ULONG *) PCSZ_DOTBMP  ||

trunk/dll/fm3res.rc

@@ -3391 +3391 @@
     IDS_SNAPSHOTFILEBADFORMAT             "The snapshot file lists no files or is not formatted correctly"
     IDS_SNAPSHOTFILELOADFAILED            "The snapshot file %s failed to load"
+    IDS_LZIPLIMITATION                    "Lzip Limitation"
+    IDS_LZIPNOLIST                        "Lzip doesn't have a list files option"
+           
     
     

trunk/dll/fm3str.h

@@ -907 +907 @@
 #define IDS_FM2LITETEXT                                       879
 #define IDS_CHANGECMDLINELENGTHDEFAULT                        880
-#define IDS_NODESMAXTEXT                                      882 //Not used
+#define IDS_LZIPLIMITATION                                    881
+#define IDS_LZIPNOLIST                                        882 
 #define IDS_DECRYPT1TEXT                                      883 //Not used
 #define IDS_DECRYPT2TEXT                                      884 //Not used