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

trunk/dll/copyf.c

@@ -24 +24 @@
 #define INCL_DOSERRORS
 #define INCL_WIN
+#define INCL_LONGLONG
 #include <os2.h>
 
@@ -50 +51 @@
 char *MakeTempName(char *buffer)
 {
-  FILESTATUS3 fs3;
+  FILESTATUS3L fs3;
   APIRET rc;
   char *p, *o;
@@ -59 +60 @@
   for (;;) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, (ULONG) sizeof(fs3));
+    rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
     if (rc == ERROR_DISK_CHANGE) {
       DosError(FERR_ENABLEHARDERR);
-      rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, (ULONG) sizeof(fs3));
+      rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
     }
     if (rc)
@@ -90 +91 @@
 {
   CHAR *p, *f, *s, *o;
-  FILESTATUS3 fs3;
+  FILESTATUS3L fs3;
   APIRET rc;
 
@@ -153 +154 @@
   for (;;) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, (ULONG) sizeof(fs3));
+    rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
     if (rc == ERROR_DISK_CHANGE) {
       DosError(FERR_ENABLEHARDERR);
-      rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, (ULONG) sizeof(fs3));
+      rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
     }
     if (rc)
@@ -281 +282 @@
     memset(pfealist, 0, ealen + 1);
     pfealist->cbList = ealen;
-    pfealist->list[0].oNextEntryOffset = 0L;
+    pfealist->list[0].oNextEntryOffset = 0;
     pfealist->list[0].fEA = 0;
     pfealist->list[0].cbName = 9;
@@ -352 +353 @@
 APIRET docopyallf(INT type, CHAR * oldname, CHAR * newname, ...)
 {
-  FILEFINDBUF3 fb;
+  FILEFINDBUF3L fb;
   ULONG nm;
   HDIR hdir;
@@ -408 +409 @@
   CHAR olddisk, newdisk, dir[CCHMAXPATH], *p, *pp;
   APIRET ret = -1, rc;
-  FILESTATUS3 st, st2, dummy;
+  FILESTATUS3L st, st2, dummy;
   BOOL diskchange = FALSE, zaplong = FALSE;
   va_list ap;
@@ -422 +423 @@
 
   DosError(FERR_DISABLEHARDERR);
-  if (DosQueryPathInfo(oldname, FIL_STANDARD, &st, sizeof(FILESTATUS3)))
+  if (DosQueryPathInfo(oldname, FIL_STANDARDL, &st, sizeof(FILESTATUS3L)))
     return (APIRET) - 2;                /* no source */
 
@@ -585 +586 @@
         DosError(FERR_DISABLEHARDERR);
         rc = DosQueryPathInfo(fullnewname,
-                              FIL_STANDARD, &st2, sizeof(FILESTATUS3));
+                              FIL_STANDARDL, &st2, sizeof(FILESTATUS3L));
         if (rc == ERROR_DISK_CHANGE) {
           DosError(FERR_ENABLEHARDERR);
           rc = DosQueryPathInfo(fullnewname,
-                                FIL_STANDARD, &st2, sizeof(FILESTATUS3));
+                                FIL_STANDARDL, &st2, sizeof(FILESTATUS3L));
         }
         if (!rc && st2.cbFile == st.cbFile) {   /* seems to have worked... */
@@ -595 +596 @@
           if (diskchange) {
             DosError(FERR_ENABLEHARDERR);
-            DosQueryPathInfo(oldname, FIL_STANDARD, &dummy, sizeof(FILESTATUS3));       /* force disk change */
+            DosQueryPathInfo(oldname, FIL_STANDARDL, &dummy, sizeof(FILESTATUS3L));     /* force disk change */
           }
           if (!(st2.attrFile & FILE_DIRECTORY)) /* erase file */
@@ -661 +662 @@
 {
   INT ret = -1;
-  FILESTATUS3 fsi;
+  FILESTATUS3L fsi;
 
   DosError(FERR_DISABLEHARDERR);
-  if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi))) {
+  if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsi, sizeof(fsi))) {
     fsi.attrFile = 0;
     DosError(FERR_DISABLEHARDERR);
-    if (!xDosSetPathInfo(filename, FIL_STANDARD, &fsi, sizeof(fsi), 0))
+    if (!xDosSetPathInfo(filename, FIL_STANDARDL, &fsi, sizeof(fsi), 0))
       ret = 0;
   }
@@ -677 +678 @@
   /* unlink everything from directory on down... */
 
-  FILEFINDBUF3 *f;
+  FILEFINDBUF3L *f;
   HDIR search_handle;
   ULONG num_matches;
@@ -735 +736 @@
 
   ss = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
-  f = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
+  f = xmalloc(sizeof(FILEFINDBUF3L), pszSrcFile, __LINE__);
   if (!ss || !f) {
     xfree(ss);
@@ -744 +745 @@
 
   search_handle = HDIR_CREATE;
-  num_matches = 1L;
+  num_matches = 1;
 
   DosError(FERR_DISABLEHARDERR);
   if (!xDosFindFirst(str, &search_handle, FILE_NORMAL | FILE_DIRECTORY |
                      FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED,
-                     f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+                     f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
 
     strcpy(ss, s);
@@ -779 +780 @@
       num_matches = 1L;
       DosError(FERR_DISABLEHARDERR);
-    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
+    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3L),
                            &num_matches));
     DosFindClose(search_handle);
@@ -794 +795 @@
   /* wildcard delete */
 
-  FILEFINDBUF3 *f;
+  FILEFINDBUF3L *f;
   HDIR search_handle;
   ULONG num_matches;
@@ -829 +830 @@
 
   ss = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);
-  f = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
+  f = xmalloc(sizeof(FILEFINDBUF3L), pszSrcFile, __LINE__);
   if (!ss || !f) {
     xfree(ss);
@@ -842 +843 @@
   DosError(FERR_DISABLEHARDERR);
   if (!xDosFindFirst(str, &search_handle, FILE_NORMAL, f,
-                     sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+                     sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
 
     strcpy(ss, s);
@@ -852 +853 @@
       num_matches = 1;
       DosError(FERR_DISABLEHARDERR);
-    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3),
+    } while (!xDosFindNext(search_handle, f, sizeof(FILEFINDBUF3L),
                            &num_matches));
     DosFindClose(search_handle);