Changeset 841 for trunk/dll/comp.c

Timestamp:

Sep 23, 2007, 6:27:51 PM (18 years ago)

Author:

Gregg Young

Message:

This implements large file support; The wrappers to allow WARP3 compatibility are not done so this will not run on Warp3or Warp 4 pre fixpack 12(?)

File:

• trunk/dll/comp.c (modified) (10 diffs)

trunk/dll/comp.c

@@ -94 +94 @@
 static VOID SnapShot(char *path, FILE *fp, BOOL recurse)
 {
-  PFILEFINDBUF4 pffb;
+  PFILEFINDBUF4L pffb;
   char *mask, *enddir;
   HDIR hdir = HDIR_CREATE;
@@ -100 +100 @@
 
   // 13 Aug 07 SHL fimxe to use FileToGet
-  pffb = xmalloc(sizeof(FILEFINDBUF4), pszSrcFile, __LINE__);
+  pffb = xmalloc(sizeof(FILEFINDBUF4L), pszSrcFile, __LINE__);
   if (pffb) {
     mask = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
@@ -117 +117 @@
                          FILE_ARCHIVED | FILE_READONLY | FILE_HIDDEN |
                          FILE_SYSTEM,
-                         pffb, sizeof(FILEFINDBUF4), &ulFindCnt, FIL_QUERYEASIZE)) {
+                         pffb, sizeof(FILEFINDBUF4L), &ulFindCnt, FIL_QUERYEASIZEL)) {
         do {
           strcpy(enddir, pffb->achName);
@@ -141 +141 @@
           }
           ulFindCnt = 1;
-        } while (!xDosFindNext(hdir, pffb, sizeof(FILEFINDBUF4), &ulFindCnt));
+        } while (!xDosFindNext(hdir, pffb, sizeof(FILEFINDBUF4L), &ulFindCnt));
         DosFindClose(hdir);
       }
@@ -190 +190 @@
   HMQ hmq2;
   FILE *fp1, *fp2;
-  ULONG len1, len2, offset = 0L;
+  ULONGLONG len1, len2;
+  ULONG offset = 0;
   LONG numread1, numread2;
   CHAR s[1024], ss[1024], *p1, *p2;
@@ -236 +237 @@
           }
           else {
-            len1 = filelength(fileno(fp1));
-            len2 = filelength(fileno(fp2));
+            len1 = _filelengthi64(fileno(fp1));
+            len2 = _filelengthi64(fileno(fp2));
             if (len1 != len2) {
               strcpy(s, GetPString(IDS_COMPDIFSIZESTEXT));
@@ -738 +739 @@
   ULONG x;
   CHAR *maskstr;
-  PFILEFINDBUF4 pffbArray;
-  PFILEFINDBUF4 pffbFile;
+  PFILEFINDBUF4L pffbArray;
+  PFILEFINDBUF4L pffbFile;
   HDIR hDir;
   ULONG ulFindCnt;
-  ULONG ulBufBytes = sizeof(FILEFINDBUF4) * FilesToGet;
+  ULONG ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet;
   APIRET rc;
 
@@ -775 +776 @@
                      FILE_SYSTEM | FILE_HIDDEN |
                      (recurse ? FILE_DIRECTORY : 0),
-                     pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZE);
+                     pffbArray, ulBufBytes, &ulFindCnt, FIL_QUERYEASIZEL);
   if (!rc) {
     do {
@@ -805 +806 @@
           }
         }
-        pffbFile = (PFILEFINDBUF4)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+        pffbFile = (PFILEFINDBUF4L)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
       } // for
       DosError(FERR_DISABLEHARDERR);
@@ -928 +929 @@
         // Use snapshot file
         FILE *fp;
-        FILEFINDBUF4 fb4;
+        FILEFINDBUF4L fb4;
         CHAR str[CCHMAXPATH * 2], *p;