Changeset 844 for trunk/dll

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/dll

Files:

• autoview.c (modified) (1 diff)
• avl.c (modified) (1 diff)
• common.c (modified) (1 diff)
• eas.c (modified) (1 diff)
• fsopen.c (modified) (1 diff)
• mle.c (modified) (1 diff)
• newview.c (modified) (1 diff)
• valid.c (modified) (2 diffs)

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);