Changeset 844

Timestamp:

Sep 24, 2007, 1:06:44 AM (18 years ago)

Author:

Gregg Young

Message:

Reversion of some large file funtions where file sizes is not used

Location:

trunk

Files:

• av2.c (modified) (12 diffs)
• debugtools/fm2dump.cmd (modified) (1 diff)
• dll/autoview.c (modified) (1 diff)
• dll/avl.c (modified) (1 diff)
• dll/common.c (modified) (1 diff)
• dll/eas.c (modified) (1 diff)
• dll/fsopen.c (modified) (1 diff)
• dll/mle.c (modified) (1 diff)
• dll/newview.c (modified) (1 diff)
• dll/valid.c (modified) (2 diffs)
• undel.c (modified) (4 diffs)

trunk/av2.c

@@ -1 +1 @@
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_LONGLONG
 
 #include <os2.h>
@@ -27 +26 @@
     HDIR search_handle;
     ULONG num_matches;
-    static FILEFINDBUF3L f;
+    static FILEFINDBUF3 f;
 
     save_dir(s);
@@ -38 +37 @@
       search_handle = HDIR_CREATE;
       num_matches = 1;
-      if (!xDosFindFirst(s,
+      if (!DosFindFirst(s,
                         &search_handle,
                         FILE_NORMAL | FILE_DIRECTORY |
@@ -44 +43 @@
                         FILE_ARCHIVED,
                         &f,
-                        sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
+                        sizeof(FILEFINDBUF3), &num_matches, FIL_STANDARD)) {
         do {
           strcpy(enddir, f.achName);
@@ -53 +52 @@
           else
             unlinkf("%s", s);
-        } while (!xDosFindNext(search_handle,
-                              &f, sizeof(FILEFINDBUF3L), &num_matches));
+        } while (!DosFindNext(search_handle,
+                              &f, sizeof(FILEFINDBUF3), &num_matches));
         DosFindClose(search_handle);
       }
@@ -100 +99 @@
                       strchr(fullname, '*') || !strchr(fullname, '.'))) {
 
-      static FILEFINDBUF3L ffb;
+      static FILEFINDBUF3 ffb;
       ULONG nm;
       HDIR hdir;
@@ -112 +111 @@
         hdir = HDIR_CREATE;
         nm = 1;
-        if (!xDosFindFirst(fullname,
+        if (!DosFindFirst(fullname,
                           &hdir,
                           FILE_NORMAL | FILE_SYSTEM |
                           FILE_READONLY | FILE_HIDDEN | FILE_ARCHIVED,
-                          &ffb, sizeof(FILEFINDBUF3L), &nm, FIL_STANDARDL)) {
+                          &ffb, sizeof(FILEFINDBUF3), &nm, FIL_STANDARD)) {
           strcpy(enddir, ffb.achName);
           DosFindClose(hdir);
@@ -130 +129 @@
         static CHAR path[CCHMAXPATH];
         CHAR *env;
-        FILESTATUS3L fs;
+        FILESTATUS3 fs;
 
         env = getenv("FM3INI");
@@ -138 +137 @@
             DosError(FERR_DISABLEHARDERR);
             if (!DosQueryPathInfo(path,
-                                  FIL_STANDARDL, &fs, (ULONG) sizeof(fs))) {
+                                  FIL_STANDARD, &fs, (ULONG) sizeof(fs))) {
               if (!(fs.attrFile & FILE_DIRECTORY)) {
                 env = strrchr(path, '\\');
@@ -146 +145 @@
               DosError(FERR_DISABLEHARDERR);
               if (!DosQueryPathInfo(path,
-                                    FIL_STANDARDL, &fs, (ULONG) sizeof(fs))) {
+                                    FIL_STANDARD, &fs, (ULONG) sizeof(fs))) {
                 if (fs.attrFile & FILE_DIRECTORY)
                   switch_to(path);
@@ -204 +203 @@
                   WinDispatchMsg(hab, &qmsg);
                 }
-                DosSleep(125L);
+                DosSleep(125);
               }
             }
@@ -211 +210 @@
       }
     Abort:
-      DosSleep(125L);
+      DosSleep(125);
       WinDestroyMsgQueue(hmq);
     }

trunk/debugtools/fm2dump.cmd

@@ -28 +28 @@
 
 :: Edit this to point to existing directory on drive with sufficient free space
-set D=%TMP%
+set D=U:\Dump
 
 :: Try to validate dump directory

trunk/dll/autoview.c

@@ -304 +304 @@
             ARC_TYPE *info;
 
-            if (!DosOpenL((CHAR *) mp1,
-                          &handle,
-                          &action,
-                          0,
-                          0,
-                          OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                          OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
-                          OPEN_FLAGS_RANDOMSEQUENTIAL | OPEN_SHARE_DENYNONE |
-                          OPEN_ACCESS_READONLY, 0)) {
+            if (!DosOpen((CHAR *) mp1,
+                         &handle,
+                         &action,
+                         0,
+                         0,
+                         OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                         OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
+                         OPEN_FLAGS_RANDOMSEQUENTIAL | OPEN_SHARE_DENYNONE |
+                         OPEN_ACCESS_READONLY, 0)) {
               ibufflen = (AutoviewHeight < 96) ? 512 : 3072;
               ibuff = xmalloc(ibufflen + 2, pszSrcFile, __LINE__);

trunk/dll/avl.c

@@ -169 +169 @@
     topsig = arcsighead;
   DosError(FERR_DISABLEHARDERR);
-  if (DosOpenL(filespec,
-               &handle,
-               &action,
-               0,
-               0,
-               OPEN_ACTION_FAIL_IF_NEW |
-               OPEN_ACTION_OPEN_IF_EXISTS,
-               OPEN_FLAGS_FAIL_ON_ERROR |
-               OPEN_FLAGS_NOINHERIT |
-               OPEN_FLAGS_RANDOMSEQUENTIAL |
-               OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, 0))
+  if (DosOpen(filespec,
+              &handle,
+              &action,
+              0,
+              0,
+              OPEN_ACTION_FAIL_IF_NEW |
+              OPEN_ACTION_OPEN_IF_EXISTS,
+              OPEN_FLAGS_FAIL_ON_ERROR |
+              OPEN_FLAGS_NOINHERIT |
+              OPEN_FLAGS_RANDOMSEQUENTIAL |
+              OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, 0))
     return NULL;
   // Scan signatures

trunk/dll/common.c

@@ -279 +279 @@
 
       dv[2] = 0;
-      rc = DosOpenL(dv,
-                    &hfile,
-                    &dlen,
-                    0,
-                    0,
-                    OPEN_ACTION_OPEN_IF_EXISTS |
-                    OPEN_ACTION_CREATE_IF_NEW,
-                    OPEN_FLAGS_DASD |
-                    OPEN_FLAGS_FAIL_ON_ERROR | OPEN_SHARE_DENYNONE, NULL);
+      rc = DosOpen(dv,
+                   &hfile,
+                   &dlen,
+                   0,
+                   0,
+                   OPEN_ACTION_OPEN_IF_EXISTS |
+                   OPEN_ACTION_CREATE_IF_NEW,
+                   OPEN_FLAGS_DASD |
+                   OPEN_FLAGS_FAIL_ON_ERROR | OPEN_SHARE_DENYNONE, NULL);
       if (rc)
-        Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__, "DosOpenL");
+        Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__, "DosOpen");
       else {
         dlen = 0;

trunk/dll/eas.c

@@ -1193 +1193 @@
   if (!filename)
     return head;
-  if (ishandle || !DosOpenL(filename, &handle, &action, 0, 0,
-                            OPEN_ACTION_FAIL_IF_NEW |
-                            OPEN_ACTION_OPEN_IF_EXISTS,
-                            OPEN_FLAGS_NOINHERIT |
-                            OPEN_SHARE_DENYREADWRITE |
-                            OPEN_ACCESS_READWRITE, (PEAOP2)0)) {
+  if (ishandle || !DosOpen(filename, &handle, &action, 0, 0,
+                           OPEN_ACTION_FAIL_IF_NEW |
+                           OPEN_ACTION_OPEN_IF_EXISTS,
+                           OPEN_FLAGS_NOINHERIT |
+                           OPEN_SHARE_DENYREADWRITE |
+                           OPEN_ACCESS_READWRITE, (PEAOP2)0)) {
     if (ishandle)
       handle = *(HFILE *) filename;

trunk/dll/fsopen.c

@@ -68 +68 @@
   else
     openmode |= OPEN_FLAGS_RANDOMSEQUENTIAL;
-  if (DosOpenL(filename, &handle, &action, 0, FILE_NORMAL, openflag, openmode,
-               (PEAOP2) 0))
+  if (DosOpen(filename, &handle, &action, 0, FILE_NORMAL, openflag, openmode,
+              (PEAOP2) 0))
     return NULL;
   if (mode[strlen(mode) - 1] == 't')

trunk/dll/mle.c

@@ -447 +447 @@
   *titletext = 0;
   WinQueryWindowText(grandpa, 512, titletext);
-  rc = DosOpenL(filename, &handle, &action, 0, 0,
-                OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
-                OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
-                OPEN_ACCESS_READONLY, 0);
+  rc = DosOpen(filename, &handle, &action, 0, 0,
+               OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+               OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
+               OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
+               OPEN_ACCESS_READONLY, 0);
   if (rc) {
     ret = FALSE;

trunk/dll/newview.c

@@ -1291 +1291 @@
                     MPFROMLONG(FCF_SIZEBORDER), MPVOID);
             WinSetFocus(HWND_DESKTOP, hwnd);
-            rc = DosOpenL(ad->filename, &handle, &action, 0, 0,
-                          OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                          OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
-                          OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
-                          OPEN_ACCESS_READONLY, 0);
+            rc = DosOpen(ad->filename, &handle, &action, 0, 0,
+                         OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                         OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
+                         OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
+                         OPEN_ACCESS_READONLY, 0);
             if (rc) {
               Dos_Error(MB_CANCEL,

trunk/dll/valid.c

@@ -300 +300 @@
 
   DosError(FERR_DISABLEHARDERR);
-  rc = DosOpenL(szPath, &hDev, &ulAction, 0, 0, FILE_OPEN,
-                OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |
-                OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, 0);
+  rc = DosOpen(szPath, &hDev, &ulAction, 0, 0, FILE_OPEN,
+               OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE |
+               OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR, 0);
   if (rc) {
     DosError(FERR_DISABLEHARDERR);
@@ -867 +867 @@
 
   if (filename) {
-    if (!DosOpenL(filename, &handle, &ulAction, 0, 0,
-                  OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
-                  OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
-                  OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
-                  OPEN_ACCESS_READONLY, 0)) {
+    if (!DosOpen(filename, &handle, &ulAction, 0, 0,
+                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NOINHERIT |
+                 OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYNONE |
+                 OPEN_ACCESS_READONLY, 0)) {
       len = 512;
       rc = DosRead(handle, buff, len, &len);

trunk/undel.c

@@ -1 +1 @@
 #define INCL_DOS
 #define INCL_WIN
-#define INCL_LONGLONG
 
 #include <os2.h>
@@ -17 +16 @@
   HAB hab;
   HMQ hmq;
-  FILESTATUS3L fs;
+  FILESTATUS3 fs;
   static CHAR fullname[CCHMAXPATH];
   CHAR *thisarg = NULL;
@@ -34 +33 @@
   }
   DosError(FERR_DISABLEHARDERR);
-  if (thisarg && !DosQueryPathInfo(thisarg, FIL_STANDARDL, &fs, sizeof(fs))) {
+  if (thisarg && !DosQueryPathInfo(thisarg, FIL_STANDARD, &fs, sizeof(fs))) {
     if (DosQueryPathInfo(thisarg,
                          FIL_QUERYFULLNAME, fullname, sizeof(fullname)))
@@ -49 +48 @@
                     FM3ModHandle, UNDEL_FRAME, (PVOID) fullname);
         }
-        DosSleep(250L);
+        DosSleep(250);
         WinDestroyMsgQueue(hmq);
       }