Changeset 849

Timestamp:

Sep 30, 2007, 9:10:59 PM (18 years ago)

Author:

Gregg Young

Message:

Initial attempt at wrapper functions for large file support. fNoLargeFileSupport is set to TRUE in init.c for testing. The code builds but isn't functional Setting fNoLargeFileSupport FALSE will yield working code.

Location:

trunk/dll

Files:

• fm3dll.h (modified) (1 diff)
• init.c (modified) (14 diffs)
• wrappers.c (modified) (4 diffs)

trunk/dll/fm3dll.h

@@ -1402 +1402 @@
   fFM2Deletes, fAutoAddAllDirs, fConfirmTarget, fChangeTarget,
   fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM,
-  fSubjectLengthMax;
+  fSubjectLengthMax, fNoLargeFileSupport;
 DATADEF BOOL detailsladate, detailslatime, detailscrdate, detailscrtime,
   detailslongname, detailsea, detailssize, detailssubject,

trunk/dll/init.c

@@ -82 +82 @@
   CHAR *pp;
   FILE *fp;
-  FILEFINDBUF3 ffb;
+  FILEFINDBUF3L ffb;
   ULONG nm;
   ULONG size = sizeof(SwapperDat);
@@ -97 +97 @@
                       FILE_NORMAL | FILE_ARCHIVED |
                       FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                      &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+                      &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
+    if (rc && rc != 2 && rc !=3){
+      FILEFINDBUF3 ffb;
+      rc = DosFindFirst(SwapperDat,
+                        &hdir,
+                        FILE_NORMAL | FILE_ARCHIVED |
+                        FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                        &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+      fNoLargeFileSupport = TRUE;
+    }
     if (!rc) {
       DosFindClose(hdir);
@@ -154 +163 @@
               hdir = HDIR_CREATE;
               nm = 1;
-              if (!DosFindFirst(SwapperDat,
+              rc = DosFindFirst(SwapperDat,
                                 &hdir,
                                 FILE_NORMAL | FILE_ARCHIVED |
                                 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
+                                &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+              if (rc){
+                FILEFINDBUF3 ffb;
+                rc = DosFindFirst(SwapperDat,
+                                  &hdir,
+                                  FILE_NORMAL | FILE_ARCHIVED |
+                                  FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                                  &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+                fNoLargeFileSupport = TRUE;
+              }
+              if (!rc) {
                 DosFindClose(hdir);
                 PrfWriteProfileString(fmprof,
@@ -182 +201 @@
   CHAR *env;
   CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3L fsa;
+  FILESTATUS3 fsa;
   APIRET rc;
 
@@ -195 +214 @@
     if (env) {
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa));
+      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
       if (!rc) {
         if (fsa.attrFile & FILE_DIRECTORY) {
           BldFullPathName(stringfile, env, "FM3RES.STR");
           DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa)))
+          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
             strcpy(stringfile, "FM3RES.STR");
         }
@@ -296 +315 @@
   CHAR *env;
   CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3L fsa;
+  FILESTATUS3 fsa;
   APIRET rc;
 
@@ -308 +327 @@
     if (env) {
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa));
+      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
       if (!rc) {
         if (fsa.attrFile & FILE_DIRECTORY) {
           BldFullPathName(stringfile, env, "FM3RES.STR");
           DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa)))
+          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
             strcpy(stringfile, "FM3RES.STR");
         }
@@ -516 +535 @@
   ULONG RVMinor = 0;
   ULONG ret = 0;
-  FILESTATUS3L fs3;                     // 25 Aug 07 SHL
+  FILESTATUS3 fs3;                      // 25 Aug 07 SHL
   PSZ env;
   CHAR dllfile[CCHMAXPATH];
@@ -534 +553 @@
   if (env) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(env, FIL_STANDARDL, &fs3, sizeof(fs3));
+    rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
     if (!rc) {
       if (fs3.attrFile & FILE_DIRECTORY) {
         BldFullPathName(dllfile, env, "FM3RES");        // 23 Aug 07 SHL
         DosError(FERR_DISABLEHARDERR);
-        if (DosQueryPathInfo(dllfile, FIL_STANDARDL, (PVOID)&fs3, (ULONG)sizeof(fs3)))
+        if (DosQueryPathInfo(dllfile, FIL_STANDARD, &fs3, sizeof(fs3)))
           strcpy(dllfile, "FM3RES");
       }
@@ -649 +668 @@
       strcpy(inipath, env);
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3));
+      rc = DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3));
       if (!rc) {
         if (fs3.attrFile & FILE_DIRECTORY)
@@ -668 +687 @@
     DosError(FERR_DISABLEHARDERR);
 
-    if (!DosQueryPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3))) {
+    if (!DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3))) {
       fIniExisted = TRUE;
       if (fs3.attrFile & (FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM)) {
         fs3.attrFile &= ~(FILE_READONLY | FILE_HIDDEN | FILE_SYSTEM);
-        rc = xDosSetPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3), 0);
+        rc = xDosSetPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3), 0);
         if (rc) {
           Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -708 +727 @@
   memset(&hini, 0, sizeof(HELPINIT));
   hini.cb = sizeof(HELPINIT);
-  hini.ulReturnCode = 0L;
+  hini.ulReturnCode = 0;
   hini.pszTutorialName = NULL;
   hini.phtHelpTable = (PHELPTABLE) MAKELONG(ID_HELPTABLE, 0xffff);
@@ -725 +744 @@
       strcpy(helppath, env);
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(helppath, FIL_STANDARDL, &fs3, sizeof(fs3));
+      rc = DosQueryPathInfo(helppath, FIL_STANDARD, &fs3, sizeof(fs3));
       if (!rc) {
         if (fs3.attrFile & FILE_DIRECTORY) {
@@ -904 +923 @@
     fSwitchTreeExpand = fNoSearch = fCustomFileDlg = fOtherHelp =
     fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
-    fShowTarget = fDrivebarHelp = fCheckMM = TRUE;
+    fShowTarget = fDrivebarHelp = fCheckMM = fNoLargeFileSupport = TRUE;
   ulCnrType = CCS_EXTENDSEL;
   FilesToGet = FILESTOGET_MIN;

trunk/dll/wrappers.c

@@ -40 +40 @@
 {
     APIRET rc;
-
+    if (fNoLargeFileSupport) {
+        switch (ulInfoLevel) {
+    case FIL_STANDARDL: {
+      FILEFINDBUF3 ff3;
+      ff3 = *(PFILEFINDBUF3)pfindbuf;
+      ulInfoLevel = FIL_STANDARD;
+      rc = DosFindFirst(pszFileSpec, phdir, flAttribute, &ff3, cbBuf,
+                        pcFileNames, ulInfoLevel);
+      *(PFILEFINDBUF3)pfindbuf = ff3;   // Copy aligned data
+      ((PFILEFINDBUF3L)pfindbuf) -> cbFile = ff3.cbFile;  // Copy unaligned data
+      ((PFILEFINDBUF3L)pfindbuf) -> cbFileAlloc = ff3.cbFileAlloc;
+      ((PFILEFINDBUF3L)pfindbuf) -> attrFile = ff3.attrFile;
+      ((PFILEFINDBUF3L)pfindbuf) -> cchName = ff3.cchName;
+      ((PFILEFINDBUF3L)pfindbuf) -> achName[CCHMAXPATHCOMP] = *ff3.achName;
+      break;
+    }
+    case  FIL_QUERYEASIZEL:{
+      FILEFINDBUF4 ff4;
+      ff4 = *(PFILEFINDBUF4)pfindbuf;
+      ulInfoLevel = FIL_QUERYEASIZE;
+      rc = DosFindFirst(pszFileSpec, phdir, flAttribute, &ff4, cbBuf,
+                        pcFileNames, ulInfoLevel);
+      //(PFILEFINDBUF4L)pfindbuf = (PFILEFINDBUF4L)pff4;   // Copy aligned data
+      ((PFILEFINDBUF4L)pfindbuf) -> oNextEntryOffset = ff4.oNextEntryOffset;
+      ((PFILEFINDBUF4L)pfindbuf) -> fdateCreation = ff4.fdateCreation;
+      ((PFILEFINDBUF4L)pfindbuf) -> ftimeCreation = ff4.ftimeCreation;
+      ((PFILEFINDBUF4L)pfindbuf) -> fdateLastAccess = ff4.fdateLastAccess;
+      ((PFILEFINDBUF4L)pfindbuf) -> ftimeLastAccess = ff4.ftimeLastAccess;
+      ((PFILEFINDBUF4L)pfindbuf) -> fdateLastWrite = ff4.fdateLastWrite;
+      ((PFILEFINDBUF4L)pfindbuf) -> ftimeLastWrite = ff4.ftimeLastWrite;
+      ((PFILEFINDBUF4L)pfindbuf) -> cbFile = ff4.cbFile;  // Copy unaligned data
+      ((PFILEFINDBUF4L)pfindbuf) -> cbFileAlloc = ff4.cbFileAlloc;
+      ((PFILEFINDBUF4L)pfindbuf) -> attrFile = ff4.attrFile;
+      ((PFILEFINDBUF4L)pfindbuf) -> cbList = ff4.cbList;
+      ((PFILEFINDBUF4L)pfindbuf) -> cchName = ff4.cchName;
+      ((PFILEFINDBUF4L)pfindbuf) -> achName[CCHMAXPATHCOMP] = *ff4.achName;
+      break;
+    }
+    default:
+        Runtime_Error(pszSrcFile, __LINE__, "ulInfoLevel %u unexpected", ulInfoLevel);
+        rc = ERROR_INVALID_PARAMETER;
+        }
+    }
+    else
     rc = DosFindFirst(pszFileSpec, phdir, flAttribute, pfindbuf, cbBuf,
                       pcFileNames, ulInfoLevel);
@@ -52 +95 @@
 {
   APIRET rc;
-
-  rc = DosFindNext(hDir, pfindbuf, cbfindbuf, pcFilenames);
+  if (fNoLargeFileSupport) {
+    if (((PFILEFINDBUF4L)pfindbuf)->cbList) {
+      FILEFINDBUF4 ff4;
+      ff4 = *(PFILEFINDBUF4)pfindbuf;
+      rc = DosFindNext(hDir, &ff4, cbfindbuf, pcFilenames);
+      *(PFILEFINDBUF4)pfindbuf = ff4;   // Copy aligned data
+      ((PFILEFINDBUF4L)pfindbuf) -> cbFile = ff4.cbFile;  // Copy unaligned data
+      ((PFILEFINDBUF4L)pfindbuf) -> cbFileAlloc = ff4.cbFileAlloc;
+      ((PFILEFINDBUF4L)pfindbuf) -> attrFile = ff4.attrFile;
+      ((PFILEFINDBUF4L)pfindbuf) -> cbList = ff4.cbList;
+      ((PFILEFINDBUF4L)pfindbuf) -> cchName = ff4.cchName;
+      ((PFILEFINDBUF4L)pfindbuf) -> achName[CCHMAXPATHCOMP] = *ff4.achName;
+    }
+    else {
+      FILEFINDBUF3 ff3;
+      ff3 = *(PFILEFINDBUF3)pfindbuf;
+      rc = DosFindNext(hDir, &ff3, cbfindbuf, pcFilenames);
+      *(PFILEFINDBUF3)pfindbuf = ff3;   // Copy aligned data
+      ((PFILEFINDBUF3L)pfindbuf) -> cbFile = ff3.cbFile;  // Copy unaligned data
+      ((PFILEFINDBUF3L)pfindbuf) -> cbFileAlloc = ff3.cbFileAlloc;
+      ((PFILEFINDBUF3L)pfindbuf) -> attrFile = ff3.attrFile;
+      ((PFILEFINDBUF3L)pfindbuf) -> cchName = ff3.cchName;
+      ((PFILEFINDBUF3L)pfindbuf) -> achName[CCHMAXPATHCOMP] = *ff3.achName;
+    }
+  }
+  else
+    rc = DosFindNext(hDir, pfindbuf, cbfindbuf, pcFilenames);
+
   return rc;
 }
@@ -75 +144 @@
                        PVOID pInfoBuf,
                        ULONG cbInfoBuf,
-                       ULONG flOptions)
-{
-    APIRET rc = DosSetPathInfo(pszPathName, ulInfoLevel, pInfoBuf, cbInfoBuf, flOptions);
+                       ULONG flOptions)
+{
     FILESTATUS3 alt_fs3;
     FILESTATUS3L alt_fs3L;
     EAOP2 alt_eaop2;
+    BOOL large = FALSE;
+    APIRET rc;
+    if (fNoLargeFileSupport && ulInfoLevel == FIL_STANDARDL){
+      large = TRUE;
+      ulInfoLevel = FIL_STANDARD;
+    }
+    rc = DosSetPathInfo(pszPathName, ulInfoLevel, pInfoBuf, cbInfoBuf, flOptions);
     if (rc == ERROR_INVALID_NAME) {
       switch (ulInfoLevel) {
         case FIL_STANDARD:
           alt_fs3 = *(PFILESTATUS3)pInfoBuf;    // Copy
-          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_fs3, sizeof(alt_fs3), flOptions);
+          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_fs3, cbInfoBuf, flOptions);
+          if (fNoLargeFileSupport && large) {
+            *(PFILESTATUS3)pInfoBuf = alt_fs3;   // Copy aligned data
+            ((PFILESTATUS3L)pInfoBuf) -> cbFile = alt_fs3.cbFile;  // Copy unaligned data
+            ((PFILESTATUS3L)pInfoBuf) -> cbFileAlloc = alt_fs3.cbFileAlloc;
+            ((PFILESTATUS3L)pInfoBuf) -> attrFile = alt_fs3.attrFile;
+          }
           break;
         case FIL_STANDARDL:
           alt_fs3L = *(PFILESTATUS3L)pInfoBuf;  // Copy
-          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_fs3L, sizeof(alt_fs3L), flOptions);
+          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_fs3L, cbInfoBuf, flOptions);
           break;
         case FIL_QUERYEASIZE:
           alt_eaop2 = *(PEAOP2)pInfoBuf;        // Copy
-          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_eaop2, sizeof(alt_eaop2), flOptions);
+          rc = DosSetPathInfo(pszPathName, ulInfoLevel, &alt_eaop2, cbInfoBuf, flOptions);
           break;
       default:
@@ -103 +184 @@
 }
 
+APIRET xDosQueryPathInfo (PSZ pszPathName, ULONG ulInfoLevel, PVOID pInfoBuf, ULONG cbInfoBuf)
+{
+  FILESTATUS3 alt_fs3;
+  FILESTATUS4 alt_fs4;
+  APIRET rc;
+  if (fNoLargeFileSupport){
+  switch (ulInfoLevel) {
+    case FIL_STANDARDL:
+          alt_fs3 = *(PFILESTATUS3)pInfoBuf;    // Copy
+          rc = DosQueryPathInfo(pszPathName, ulInfoLevel, &alt_fs3, cbInfoBuf);
+          *(PFILESTATUS3)pInfoBuf = alt_fs3;   // Copy aligned data
+          ((PFILESTATUS3L)pInfoBuf) -> cbFile = alt_fs3.cbFile;  // Copy unaligned data
+          ((PFILESTATUS3L)pInfoBuf) -> cbFileAlloc = alt_fs3.cbFileAlloc;
+          ((PFILESTATUS3L)pInfoBuf) -> attrFile = alt_fs3.attrFile;
+          break;
+    case FIL_QUERYEASIZEL:
+          alt_fs4 = *(PFILESTATUS4)pInfoBuf;    // Copy
+          rc = DosQueryPathInfo(pszPathName, ulInfoLevel, &alt_fs4, cbInfoBuf);
+          *(PFILESTATUS4)pInfoBuf = alt_fs4;   // Copy aligned data
+          ((PFILESTATUS4L)pInfoBuf) -> cbFile = alt_fs4.cbFile;  // Copy unaligned data
+          ((PFILESTATUS4L)pInfoBuf) -> cbFileAlloc = alt_fs4.cbFileAlloc;
+          ((PFILESTATUS4L)pInfoBuf) -> attrFile = alt_fs4.attrFile;
+          ((PFILESTATUS4L)pInfoBuf) -> cbList = alt_fs4.cbList;
+          break;
+      default:
+        Runtime_Error(pszSrcFile, __LINE__, "ulInfoLevel %u unexpected", ulInfoLevel);
+        rc = ERROR_INVALID_PARAMETER;
+      } // switch
+  }
+  else
+    DosQueryPathInfo (pszPathName, ulInfoLevel, pInfoBuf, cbInfoBuf);
+  return rc;
+}
 PSZ xfgets(PSZ pszBuf, size_t cMaxBytes, FILE * fp, PCSZ pszSrcFile,
            UINT uiLineNumber)