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

trunk/dll/init.c

@@ -52 +52 @@
 #define INCL_GPI
 #define INCL_DOSERRORS
+#define INCL_LONGLONG
 #include <os2.h>
 #include <os2me.h>
@@ -81 +82 @@
   CHAR *pp;
   FILE *fp;
-  FILEFINDBUF3 ffb;
+  FILEFINDBUF3L ffb;
   ULONG nm;
   ULONG size = sizeof(SwapperDat);
@@ -96 +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) {
       DosFindClose(hdir);
@@ -157 +158 @@
                                  FILE_NORMAL | FILE_ARCHIVED |
                                  FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                 &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
+                                 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) {
                 DosFindClose(hdir);
                 PrfWriteProfileString(fmprof,
@@ -181 +182 @@
   CHAR *env;
   CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3 fsa;
+  FILESTATUS3L fsa;
   APIRET rc;
 
@@ -194 +195 @@
     if (env) {
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
+      rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa));
       if (!rc) {
         if (fsa.attrFile & FILE_DIRECTORY) {
           BldFullPathName(stringfile, env, "FM3RES.STR");
           DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
+          if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa)))
             strcpy(stringfile, "FM3RES.STR");
         }
@@ -295 +296 @@
   CHAR *env;
   CHAR stringfile[CCHMAXPATH];
-  FILESTATUS3 fsa;
+  FILESTATUS3L fsa;
   APIRET rc;
 
@@ -307 +308 @@
     if (env) {
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(env, FIL_STANDARD, &fsa, sizeof(fsa));
+      rc = DosQueryPathInfo(env, FIL_STANDARDL, &fsa, sizeof(fsa));
       if (!rc) {
         if (fsa.attrFile & FILE_DIRECTORY) {
           BldFullPathName(stringfile, env, "FM3RES.STR");
           DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo(stringfile, FIL_STANDARD, &fsa, sizeof(fsa)))
+          if (DosQueryPathInfo(stringfile, FIL_STANDARDL, &fsa, sizeof(fsa)))
             strcpy(stringfile, "FM3RES.STR");
         }
@@ -409 +410 @@
   HDIR search_handle;
   ULONG num_matches;
-  static FILEFINDBUF3 f;
+  static FILEFINDBUF3L f;
 
   StopTimer();
@@ -449 +450 @@
                        FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
                        FILE_ARCHIVED,
-                       &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+                       &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
       do {
         strcpy(enddir, f.achName);
@@ -460 +461 @@
       }
       while (!xDosFindNext(search_handle,
-                           &f, sizeof(FILEFINDBUF3), &num_matches));
+                           &f, sizeof(FILEFINDBUF3L), &num_matches));
       DosFindClose(search_handle);
     }
@@ -478 +479 @@
                      FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
                      FILE_ARCHIVED,
-                     &f, sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
+                     &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
     do {
       if (!(f.attrFile & FILE_DIRECTORY)) {
@@ -486 +487 @@
     }
     while (!xDosFindNext(search_handle,
-                         &f, sizeof(FILEFINDBUF3), &num_matches));
+                         &f, sizeof(FILEFINDBUF3L), &num_matches));
     DosFindClose(search_handle);
   }
@@ -515 +516 @@
   ULONG RVMinor = 0;
   ULONG ret = 0;
-  FILESTATUS3 fs3;                      // 25 Aug 07 SHL
+  FILESTATUS3L fs3;                     // 25 Aug 07 SHL
   PSZ env;
   CHAR dllfile[CCHMAXPATH];
@@ -533 +534 @@
   if (env) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
+    rc = DosQueryPathInfo(env, FIL_STANDARDL, &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_STANDARD, (PVOID)&fs3, (ULONG)sizeof(fs3)))
+        if (DosQueryPathInfo(dllfile, FIL_STANDARDL, (PVOID)&fs3, (ULONG)sizeof(fs3)))
           strcpy(dllfile, "FM3RES");
       }
@@ -648 +649 @@
       strcpy(inipath, env);
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3));
+      rc = DosQueryPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3));
       if (!rc) {
         if (fs3.attrFile & FILE_DIRECTORY)
@@ -667 +668 @@
     DosError(FERR_DISABLEHARDERR);
 
-    if (!DosQueryPathInfo(inipath, FIL_STANDARD, &fs3, sizeof(fs3))) {
+    if (!DosQueryPathInfo(inipath, FIL_STANDARDL, &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_STANDARD, &fs3, sizeof(fs3), 0);
+        rc = xDosSetPathInfo(inipath, FIL_STANDARDL, &fs3, sizeof(fs3), 0);
         if (rc) {
           Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -724 +725 @@
       strcpy(helppath, env);
       DosError(FERR_DISABLEHARDERR);
-      rc = DosQueryPathInfo(helppath, FIL_STANDARD, &fs3, sizeof(fs3));
+      rc = DosQueryPathInfo(helppath, FIL_STANDARDL, &fs3, sizeof(fs3));
       if (!rc) {
         if (fs3.attrFile & FILE_DIRECTORY) {