Changeset 843 for trunk/dll/inis.c

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

File:

• trunk/dll/inis.c (modified) (10 diffs)

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