Changeset 841 for trunk/dll/worker.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/worker.c (modified) (12 diffs)

trunk/dll/worker.c

@@ -31 +31 @@
 #define INCL_DOSERRORS
 #define INCL_WPCLASS                    // WinQueryObjectPath
+#define INCL_LONGLONG
 #include <os2.h>
 
@@ -127 +128 @@
         if (hmq2) {
           CHAR message[(CCHMAXPATH * 2) + 80], wildname[CCHMAXPATH];
-          register INT x;
+          INT x;
           BOOL dontask = FALSE, wildcarding = FALSE, overold =
             FALSE, overnew = FALSE, usedtarget;
@@ -397 +398 @@
                     goto Abort;
                   {
-                    FILESTATUS3 fsa;
+                    FILESTATUS3L fsa;
 
                     DosError(FERR_DISABLEHARDERR);
                     if (DosQueryPathInfo(ex.extractdir,
-                                         FIL_STANDARD,
+                                         FIL_STANDARDL,
                                          &fsa,
-                                         (ULONG) sizeof(FILESTATUS3)) ||
-                        !(fsa.attrFile & FILE_DIRECTORY))
+                                         (ULONG) sizeof(FILESTATUS3L)) ||
+                    !(fsa.attrFile & FILE_DIRECTORY))
                       goto Abort;
                   }
@@ -486 +487 @@
               case IDM_OPENTREE:
                 {
-                  FILESTATUS3 fsa;
+                  FILESTATUS3L fsa;
 
                   DosError(FERR_DISABLEHARDERR);
                   if (DosQueryPathInfo(wk->li->list[x],
-                                       FIL_STANDARD,
+                                       FIL_STANDARDL,
                                        &fsa,
-                                       (ULONG) sizeof(FILESTATUS3)) ||
-                      !(fsa.attrFile & FILE_DIRECTORY))
+                                       (ULONG) sizeof(FILESTATUS3L)) ||
+                  !(fsa.attrFile & FILE_DIRECTORY))
                     break;
                 }
@@ -600 +601 @@
                   APIRET rc;
                   INT type;
-                  FILESTATUS4 fs4;
+                  FILESTATUS4L fs4;
                   BOOL isnewer, existed;
 
@@ -755 +756 @@
                              DRIVE_NOTWRITEABLE)
                         && toupper(*newname) != toupper(*wk->li->list[x])
-                        && !DosQueryPathInfo(wk->li->list[x], FIL_QUERYEASIZE,
+                        && !DosQueryPathInfo(wk->li->list[x], FIL_QUERYEASIZEL,
                                              &fs4, sizeof(fs4))
                         && !(fs4.attrFile & FILE_DIRECTORY)) {
@@ -777 +778 @@
                             DosError(FERR_DISABLEHARDERR);
                             if (!DosQueryPathInfo(wk->li->list[cntr],
-                                                  FIL_QUERYEASIZE,
+                                                  FIL_QUERYEASIZEL,
                                                   &fs4,
                                                   sizeof(fs4)) &&
@@ -1247 +1248 @@
               x = 0;
               while (wk->li->list[x]) {
-                FILESTATUS3 fsa;
+                FILESTATUS3L fsa;
                 // BOOL spaces;
                 // if (needs_quoting(wk->li->list[x])) {
@@ -1256 +1257 @@
                 //   spaces = FALSE;
                 // strcat(szBuffer, wk->li->list[x]);
-                memset(&fsa, 0, sizeof(FILESTATUS3));
+                memset(&fsa, 0, sizeof(FILESTATUS3L));
                 DosError(FERR_DISABLEHARDERR);
                 DosQueryPathInfo(wk->li->list[x],
-                                 FIL_STANDARD,
-                                 &fsa, (ULONG) sizeof(FILESTATUS3));
+                                 FIL_STANDARDL,
+                                 &fsa, (ULONG) sizeof(FILESTATUS3L));
                 if (fsa.attrFile & FILE_DIRECTORY) {
                   BldQuotedFullPathName(szBuffer + strlen(szBuffer), wk->li->list[x], "*");
@@ -1447 +1448 @@
               INT isdir = 0, sysdir = 0, ro = 0, hs = 0;
               register INT x;
-              FILESTATUS3 fsa;
+              FILESTATUS3L fsa;
               CHAR prompt[CCHMAXPATH * 3];
               APIRET error;
@@ -1462 +1463 @@
                 DosError(FERR_DISABLEHARDERR);
                 if (DosQueryPathInfo(wk->li->list[x],
-                                     FIL_STANDARD, &fsa,
-                                     (ULONG) sizeof(FILESTATUS3))) {
+                                     FIL_STANDARDL, &fsa,
+                                     (ULONG) sizeof(FILESTATUS3L))) {
                   wk->li->list = RemoveFromList(wk->li->list,
                                                 wk->li->list[x]);
@@ -1549 +1550 @@
                 DosError(FERR_DISABLEHARDERR);
                 DosQueryPathInfo(wk->li->list[x],
-                                 FIL_STANDARD,
-                                 &fsa, (ULONG) sizeof(FILESTATUS3));
+                                 FIL_STANDARDL,
+                                 &fsa, (ULONG) sizeof(FILESTATUS3L));
                 if (fsa.attrFile & FILE_DIRECTORY) {
                   sprintf(prompt,