Changeset 843

Timestamp:

Sep 24, 2007, 12:46:47 AM (18 years ago)

Author:

Steven Levine

Message:

Revert to standard APIs where large file support not required by ticket #41

Location:

trunk/dll

Files:

• copyf.c (modified) (4 diffs)
• dirs.c (modified) (1 diff)
• droplist.c (modified) (3 diffs)
• inis.c (modified) (10 diffs)
• init.c (modified) (7 diffs)
• mainwnd2.c (modified) (1 diff)
• mle.c (modified) (1 diff)
• printer.c (modified) (4 diffs)

trunk/dll/copyf.c

@@ -51 +51 @@
 char *MakeTempName(char *buffer)
 {
-  FILESTATUS3L fs3;
+  FILESTATUS3 fs3;
   APIRET rc;
   char *p, *o;
@@ -60 +60 @@
   for (;;) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
+    rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, sizeof(fs3));
     if (rc == ERROR_DISK_CHANGE) {
       DosError(FERR_ENABLEHARDERR);
-      rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
+      rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, sizeof(fs3));
     }
     if (rc)
@@ -91 +91 @@
 {
   CHAR *p, *f, *s, *o;
-  FILESTATUS3L fs3;
+  FILESTATUS3 fs3;
   APIRET rc;
 
@@ -154 +154 @@
   for (;;) {
     DosError(FERR_DISABLEHARDERR);
-    rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
+    rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, sizeof(fs3));
     if (rc == ERROR_DISK_CHANGE) {
       DosError(FERR_ENABLEHARDERR);
-      rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3));
+      rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fs3, sizeof(fs3));
     }
     if (rc)

trunk/dll/dirs.c

@@ -69 +69 @@
 
   APIRET ret;
-  FILESTATUS3L fsa;
+  FILESTATUS3 fsa;
   CHAR path[CCHMAXPATH + 1], *p;
 
   strcpy(path, s);
   while (*path) {
-    ret = DosQueryPathInfo(path, FIL_STANDARDL, &fsa,
-                           (ULONG) sizeof(FILESTATUS3L));
+    ret = DosQueryPathInfo(path, FIL_STANDARD, &fsa, sizeof(fsa));
     if (ret || !(fsa.attrFile & FILE_DIRECTORY)) {
       p = strrchr(path, '\\');

trunk/dll/droplist.c

@@ -104 +104 @@
                              &fsa3,
                              sizeof(fsa3)) ||
-            (fsa3.attrFile & FILE_DIRECTORY) != 0) {
+            fsa3.attrFile & FILE_DIRECTORY) {
           *buffer1 = 0;
           return ret;
@@ -126 +126 @@
    */
 
-  register ULONG len, blen;
+  ULONG len, blen;
   BOOL ret = FALSE;
   APIRET rc;
+  FILESTATUS3 fsa3;
 
   if (pDItem && buffer && buflen) {     /* else error calling function */
@@ -165 +166 @@
                   "DosQueryPathInfo");
     }
-    {                                   /* be sure that file/directory is accessible */
-        FILESTATUS3L fsa3;
-
-      rc = DosQueryPathInfo(buffer, FIL_STANDARDL, &fsa3, sizeof(fsa3));
-      if (!rc)
-        ret = TRUE;
-      else {
-          Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                    "DosQueryPathInfo");
-          *buffer = 0;
-      }
+
+    rc = DosQueryPathInfo(buffer, FIL_STANDARD, &fsa3, sizeof(fsa3));
+    if (!rc)
+      ret = TRUE;
+    else {
+        Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DosQueryPathInfo");
+        *buffer = 0;
     }
   }

trunk/dll/inis.c

@@ -27 +27 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
-#define INCL_LONGLONG
 #include <os2.h>
 
@@ -524 +523 @@
       nm = 1;
       DosError(FERR_DISABLEHARDERR);
-      if (!xDosFindFirst("*.IST",
-                         &hdir,
-                         FILE_NORMAL | FILE_ARCHIVED,
-                         &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) {
+      if (!DosFindFirst("*.IST",
+                        &hdir,
+                        FILE_NORMAL | FILE_ARCHIVED,
+                        &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
         do {
           priority_bumped();
@@ -534 +533 @@
                             MPFROMP(ffb.achName));
           nm = 1;
-        } while (!xDosFindNext(hdir, &ffb, sizeof(ffb), &nm));
+        } while (!DosFindNext(hdir, &ffb, sizeof(ffb), &nm));
         DosFindClose(hdir);
         priority_bumped();
@@ -1179 +1178 @@
             break;
           }
-          /*  replace temp inis with new permanent inis */
+          /* replace temp inis with new permanent inis */
           memset(&prfp, 0, sizeof(PRFPROFILE));
           prfp.cchUserName = strlen(oldsysini);
@@ -1573 +1572 @@
       hDrop = DrgDrag(hwnd, pDInfo, &DIcon, 1L, VK_ENDDRAG, (PVOID) NULL);
       if (hDrop == NULLHANDLE)
-        FreeDragInfoData(hwnd, pDInfo);
+        FreeDragInfoData(hwnd, pDInfo);
       WinDestroyPointer(hptrINI);
     }
@@ -1584 +1583 @@
 
       if (!DrgAccessDraginfo(pDInfo)) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
       }
       else {
-        pDItem = DrgQueryDragitemPtr(pDInfo,0);
-        /* Check valid rendering mechanisms and data */
-        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
+        pDItem = DrgQueryDragitemPtr(pDInfo,0);
+        /* Check valid rendering mechanisms and data */
+        if (DrgVerifyRMF(pDItem, DRM_OS2FILE, NULL)) {
           DrgFreeDraginfo(pDInfo);
           return (MRFROM2SHORT(DOR_DROP, DO_LINK));     /* OK to drop */
-        }
-        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
+        }
+        else if (DrgVerifyRMF(pDItem, DRM_FM2INIRECORD, DRF_FM2INI)) {
           if (WinQueryWindow(pDInfo->hwndSource, QW_PARENT) !=
               WinQueryWindow(hwnd, QW_PARENT))
@@ -1601 +1600 @@
             return (MRFROM2SHORT(DOR_DROP, ((fCopyDefault) ? DO_COPY : DO_MOVE)));
           }
-        }
-        DrgFreeDraginfo(pDInfo);
+        }
+        DrgFreeDraginfo(pDInfo);
       }
     }
@@ -1614 +1613 @@
     {
       PDRAGINFO pDInfo = (PDRAGINFO) mp1;
-      PDRAGITEM pDItem;         /* Pointer to DRAGITEM   */
+      PDRAGITEM pDItem;         /* Pointer to DRAGITEM */
       ULONG numitems, curitem, len;
       USHORT action;
@@ -1623 +1622 @@
 
       if (!DrgAccessDraginfo(pDInfo)) {
-        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
-                  "DrgAccessDraginfo");
-        return 0;
+        Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  "DrgAccessDraginfo");
+        return 0;
       }
       numitems = DrgQueryDragitemCount(pDInfo);
@@ -1638 +1637 @@
           else {
             if (FullDrgName(pDItem, szFrom, sizeof(szFrom)) &&
-                !DosQueryPathInfo(szFrom, FIL_STANDARDL, &fsa,
-                                  (ULONG) sizeof(FILESTATUS3L)))
+                !DosQueryPathInfo(szFrom, FIL_STANDARD, &fsa, sizeof(fsa)))
               WinSendMsg(WinQueryWindow(hwnd, QW_PARENT), WM_COMMAND,
                          MPFROM2SHORT(IDM_COMPARE, 0), MPFROMP(szFrom));

trunk/dll/init.c

@@ -82 +82 @@
   CHAR *pp;
   FILE *fp;
-  FILEFINDBUF3L ffb;
+  FILEFINDBUF3 ffb;
   ULONG nm;
   ULONG size = sizeof(SwapperDat);
@@ -93 +93 @@
   if (*SwapperDat) {
     nm = 1;
-    rc = xDosFindFirst(SwapperDat,
-                       &hdir,
-                       FILE_NORMAL | FILE_ARCHIVED |
-                       FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                       &ffb, sizeof(ffb), &nm, FIL_STANDARDL);
+    rc = DosFindFirst(SwapperDat,
+                      &hdir,
+                      FILE_NORMAL | FILE_ARCHIVED |
+                      FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                      &ffb, sizeof(ffb), &nm, FIL_STANDARD);
     if (!rc) {
       DosFindClose(hdir);
@@ -154 +154 @@
               hdir = HDIR_CREATE;
               nm = 1;
-              if (!xDosFindFirst(SwapperDat,
-                                 &hdir,
-                                 FILE_NORMAL | FILE_ARCHIVED |
-                                 FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
-                                 &ffb, sizeof(ffb), &nm, FIL_STANDARDL)) {
+              if (!DosFindFirst(SwapperDat,
+                                &hdir,
+                                FILE_NORMAL | FILE_ARCHIVED |
+                                FILE_HIDDEN | FILE_SYSTEM | FILE_READONLY,
+                                &ffb, sizeof(ffb), &nm, FIL_STANDARD)) {
                 DosFindClose(hdir);
                 PrfWriteProfileString(fmprof,
@@ -410 +410 @@
   HDIR search_handle;
   ULONG num_matches;
-  static FILEFINDBUF3L f;
+  FILEFINDBUF3 ffb;
 
   StopTimer();
@@ -445 +445 @@
     search_handle = HDIR_CREATE;
     num_matches = 1L;
-    if (!xDosFindFirst(s,
-                       &search_handle,
-                       FILE_NORMAL | FILE_DIRECTORY |
-                       FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                       FILE_ARCHIVED,
-                       &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
+    if (!DosFindFirst(s,
+                      &search_handle,
+                      FILE_NORMAL | FILE_DIRECTORY |
+                      FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                      FILE_ARCHIVED,
+                      &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
       do {
-        strcpy(enddir, f.achName);
-        if (f.attrFile & FILE_DIRECTORY) {
+        strcpy(enddir, ffb.achName);
+        if (ffb.attrFile & FILE_DIRECTORY) {
           wipeallf("%s\\*", s);
           DosDeleteDir(s);
@@ -460 +460 @@
           unlinkf("%s", s);
       }
-      while (!xDosFindNext(search_handle,
-                           &f, sizeof(FILEFINDBUF3L), &num_matches));
+      while (!DosFindNext(search_handle,
+                          &ffb, sizeof(ffb), &num_matches));
       DosFindClose(search_handle);
     }
@@ -474 +474 @@
   search_handle = HDIR_CREATE;
   num_matches = 1;
-  if (!xDosFindFirst(s,
-                     &search_handle,
-                     FILE_NORMAL | FILE_DIRECTORY |
-                     FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
-                     FILE_ARCHIVED,
-                     &f, sizeof(FILEFINDBUF3L), &num_matches, FIL_STANDARDL)) {
+  if (!DosFindFirst(s,
+                    &search_handle,
+                    FILE_NORMAL | FILE_DIRECTORY |
+                    FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
+                    FILE_ARCHIVED,
+                    &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
     do {
-      if (!(f.attrFile & FILE_DIRECTORY)) {
-        strcpy(enddir, f.achName);
+      if (!(ffb.attrFile & FILE_DIRECTORY)) {
+        strcpy(enddir, ffb.achName);
         unlinkf("%s", s);
       }
     }
-    while (!xDosFindNext(search_handle,
-                         &f, sizeof(FILEFINDBUF3L), &num_matches));
+    while (!DosFindNext(search_handle,
+                        &ffb, sizeof(ffb), &num_matches));
     DosFindClose(search_handle);
   }

trunk/dll/mainwnd2.c

@@ -1363 +1363 @@
   {
     CHAR inipath[CCHMAXPATH], fullpath[CCHMAXPATH];
-    FILESTATUS3L fsa;
+    FILESTATUS3 fsa;
 
     if (PrfQueryProfileString(HINI_USERPROFILE,
                               FM2Str,
                               "Home", NULL, inipath, sizeof(inipath))) {
-      if (!DosQueryPathInfo(inipath, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa))) {
+      if (!DosQueryPathInfo(inipath, FIL_STANDARD, &fsa, sizeof(fsa))) {
         if (fsa.attrFile & FILE_DIRECTORY) {
           if (DosQueryPathInfo(inipath,

trunk/dll/mle.c

@@ -775 +775 @@
    */
 
-  FILESTATUS3L fsa;
+  FILESTATUS3 fsa;
   BOOL ret;
 
-  if (!DosQueryPathInfo(filename, FIL_STANDARDL, &fsa, (ULONG) sizeof(fsa)) &&
-      !(fsa.attrFile & FILE_DIRECTORY)) {
+  if (!DosQueryPathInfo(filename, FIL_STANDARD, &fsa, sizeof(fsa)) &&
+      ~fsa.attrFile & FILE_DIRECTORY) {
     MLEclearall(h);
     ret = MLEinsertfile(h, filename);

trunk/dll/printer.c

@@ -18 +18 @@
 ***********************************************************************/
 
-#define INCL_DOS
-#define INCL_WIN
-#define INCL_LONGLONG
-
-#include <os2.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30 +25 @@
 #include <share.h>
 #include <string.h>
+
+#define INCL_DOS
+#define INCL_WIN
+#include <os2.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -97 +97 @@
   FILE *fpi, *fpo;
   CHAR s[CCHMAXPATH + 80];
-  FILESTATUS3L fs3;
+  FILESTATUS3 fs3;
   LONG cols, lines, pages, z, lmargin, rmargin;
   BOOL endline, endpage, startpage, skipping, firstpass;
@@ -125 +125 @@
             break;
           DosError(FERR_DISABLEHARDERR);
-          if (DosQueryPathInfo
-              (li->list[x], FIL_STANDARDL, &fs3, (ULONG) sizeof(fs3))
-              || (fs3.attrFile & FILE_DIRECTORY) || !fs3.cbFile)
+          if (DosQueryPathInfo(li->list[x], FIL_STANDARD, &fs3, sizeof(fs3)) ||
+              fs3.attrFile & FILE_DIRECTORY ||
+              !fs3.cbFile)
             continue;
           if (StopPrinting)