Changeset 850 for trunk/dll/init.c

Timestamp:

Oct 7, 2007, 4:50:15 AM (18 years ago)

Author:

Steven Levine

Message:

Rework large file support wrappers (ticket #41)
Add code to avoid NTFS driver small file read defect (ticket #159)
Add debug code to try to catch David's drive bar exception
Another attempt to correct newview fast viewer text load failure

File:

• trunk/dll/init.c (modified) (4 diffs)

trunk/dll/init.c

@@ -97 +97 @@
                       FILE_NORMAL | FILE_ARCHIVED |
                       FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                      &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
-    if (rc && rc != 2 && rc !=3){
+                      &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
+    if (rc && rc != ERROR_FILE_NOT_FOUND && rc != ERROR_PATH_NOT_FOUND) {
       FILEFINDBUF3 ffb;
       rc = DosFindFirst(SwapperDat,
-                        &hdir,
-                        FILE_NORMAL | FILE_ARCHIVED |
-                        FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                        &ffb, sizeof(ffb), &nm, FIL_STANDARD);
+                        &hdir,
+                        FILE_NORMAL | FILE_ARCHIVED |
+                        FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                        &ffb, sizeof(ffb), &nm, FIL_STANDARD);
       fNoLargeFileSupport = TRUE;
     }
@@ -167 +167 @@
                                 FILE_NORMAL | FILE_ARCHIVED |
                                 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                &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) {
+                                &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,
@@ -923 +923 @@
     fSwitchTreeExpand = fNoSearch = fCustomFileDlg = fOtherHelp =
     fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
-    fShowTarget = fDrivebarHelp = fCheckMM = fNoLargeFileSupport = TRUE;
+    fShowTarget = fDrivebarHelp = fCheckMM = TRUE;
+#if 1 // 06 Oct 07 SHL fixme to be gone after wrapper testing finished
+    fNoLargeFileSupport = TRUE;
+#endif
   ulCnrType = CCS_EXTENDSEL;
   FilesToGet = FILESTOGET_MIN;
@@ -1076 +1079 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "UseQProcStat",
-                      &fUseQProcStat, &size);
+                      &fUseQProcStat, &size);
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "UseQSysState",