Changeset 783 for trunk/dll/objcnr.c

Timestamp:

Aug 14, 2007, 6:09:54 AM (18 years ago)

Author:

Steven Levine

Message:

Rework DosFindFirst/Next loops to optimize memory allocation and code paths
Adjust FilesToGet limits
Update configuration notebook scanning page
Start updating #pragma alloc_text positioning for OpenWatcom compatibility

File:

• trunk/dll/objcnr.c (modified) (11 diffs)

trunk/dll/objcnr.c

@@ -18 +18 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  13 Aug 07 SHL Avoid realloc - not needed; sanitize code
+  13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -24 +25 @@
 #define INCL_DOS
 #define INCL_WIN
+#define INCL_DOSERRORS
 #include <os2.h>
 
@@ -59 +61 @@
 static HWND objcnrwnd;
 
-#pragma alloc_text(OBJCNR,ProcessDir,FillCnrsThread,ObjCnrDlgProc)
-
-static VOID ProcessDir(HWND hwndCnr, CHAR * filename, PCNRITEM pciParent,
-                       CHAR * stopflag)
+static VOID ProcessDir(HWND hwndCnr,
+                       CHAR *filename,
+                       PCNRITEM pciParent,
+                       CHAR *stopflag)
 {
   CHAR maskstr[CCHMAXPATH], *endpath, *p;
-  ULONG nm, ulM;
+  ULONG ulFindCnt, ulFindMax;
+  ULONG ulBufBytes;
   HDIR hdir;
-  FILEFINDBUF3 *ffb, *fft;
+  PFILEFINDBUF3 pffbArray;
   APIRET rc;
   RECORDINSERT ri;
   PCNRITEM pciP;
-
-  ffb = xmalloc(sizeof(FILEFINDBUF3), pszSrcFile, __LINE__);
-  if (!ffb)
-    return;
+  HPOINTER hptr;
+
+  ulBufBytes = sizeof(FILEFINDBUF3) * FilesToGet;
+  pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
+  if (!pffbArray)
+    return;                             // Error already reported
   strcpy(maskstr, filename);
   if (maskstr[strlen(maskstr) - 1] != '\\')
@@ -81 +86 @@
   strcat(maskstr, "*");
   hdir = HDIR_CREATE;
-  nm = 1;
+  ulFindCnt = 1;
   rc = DosFindFirst(filename, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
                     FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY,
-                    ffb, sizeof(FILEFINDBUF3), &nm, FIL_STANDARD);
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD);
   if (!rc)
     DosFindClose(hdir);
-
-  if (rc) {                             /* work around furshluginer FAT bug... */
-    if (IsRoot(filename))
-      rc = 0;
-  }
-
-  if ((!rc && (ffb->attrFile & FILE_DIRECTORY))) {
+  // work around furshluginer FAT root bug
+  else if (IsRoot(filename))
+    rc = 0;
+
+  if ((!rc && (pffbArray->attrFile & FILE_DIRECTORY))) {
     pciP = WinSendMsg(hwndCnr,
                       CM_ALLOCRECORD,
@@ -100 +103 @@
                       MPFROMLONG(1));
     if (!pciP) {
-      free(ffb);
+      Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
+      free(pffbArray);
       return;
     }
@@ -125 +129 @@
   }
   else {
-    free(ffb);
-    Dos_Error(MB_ENTER,
-              rc,
-              HWND_DESKTOP,
-              pszSrcFile,
-              __LINE__, GetPString(IDS_CANTFINDDIRTEXT), filename);
+    free(pffbArray);
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), filename);
     return;
   }
-  {
-    HPOINTER hptr;
-
-    hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
-    if (hptr)
-      pciP->rc.hptrIcon = hptr;
-  }
+
+  hptr = WinLoadFileIcon(pciP->pszFileName, FALSE);
+  if (hptr)
+    pciP->rc.hptrIcon = hptr;
+
   if (!pciP->rc.hptrIcon || pciP->rc.hptrIcon == hptrFile)      /* OS/2 bug bug bug bug */
     pciP->rc.hptrIcon = hptrDir;
+
   memset(&ri, 0, sizeof(RECORDINSERT));
   ri.cb = sizeof(RECORDINSERT);
@@ -150 +150 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pciP), MPFROMP(&ri))) {
-    free(ffb);
+    free(pffbArray);
     return;
   }
@@ -156 +156 @@
   if (!isalpha(*maskstr) || maskstr[1] != ':' || maskstr[2] != '\\' ||
       ((driveflags[toupper(*maskstr) - 'A'] & DRIVE_REMOTE) && fRemoteBug))
-    ulM = 1;
+    ulFindMax = 1;
   else
-    ulM = FilesToGet;
-  if (ulM > 1) {
-    fft = xrealloc(ffb, sizeof(FILEFINDBUF3) * ulM, pszSrcFile, __LINE__);
-    if (!fft)
-      ulM = 1;
-    else
-      ffb = fft;
-  }
-  nm = ulM;
+    ulFindMax = FilesToGet;
+  ulFindCnt = ulFindMax;
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
-                    FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY, ffb,
-                    sizeof(FILEFINDBUF3) * ulM, &nm, FIL_STANDARD);
+                    FILE_SYSTEM | FILE_HIDDEN | MUST_HAVE_DIRECTORY,
+                    pffbArray, ulBufBytes, &ulFindCnt, FIL_STANDARD);
   if (!rc) {
-
-    register PBYTE fb = (PBYTE) ffb;
-    FILEFINDBUF3 *pffbFile;
+    PFILEFINDBUF3 pffbFile;
     ULONG x;
 
     while (!rc) {
-      for (x = 0; x < nm; x++) {
-        pffbFile = (FILEFINDBUF3 *) fb;
+      pffbFile = pffbArray;
+      for (x = 0; x < ulFindCnt; x++) {
         if (*stopflag)
           break;
@@ -192 +183 @@
         if (!pffbFile->oNextEntryOffset)
           break;
-        fb += pffbFile->oNextEntryOffset;
-      }
+        pffbFile = (PFILEFINDBUF3)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
+      } // for
       DosSleep(1);
       if (*stopflag)
         break;
-      nm = ulM;
-      rc = DosFindNext(hdir, ffb, sizeof(FILEFINDBUF3) * ulM, &nm);
-    }
+      ulFindCnt = ulFindMax;
+      rc = DosFindNext(hdir, pffbArray, ulBufBytes, &ulFindCnt);
+    } // while
     DosFindClose(hdir);
   }
-  free(ffb);
+
+  if (rc && rc != ERROR_NO_MORE_FILES) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              GetPString(IDS_CANTFINDDIRTEXT), filename);
+  }
+
+  free(pffbArray);
   WinSendMsg(hwndCnr, CM_INVALIDATERECORD, MPFROMP(&pciP),
              MPFROM2SHORT(1, 0));
@@ -211 +208 @@
   HAB hab;
   HMQ hmq;
-  DIRSIZE *dirsize = (DIRSIZE *) args;
-
-  if (!dirsize)
+  DIRSIZE *dirsize = (DIRSIZE *)args;
+
+  if (!dirsize) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
     return;
+  }
 
   DosError(FERR_DISABLEHARDERR);
@@ -430 +429 @@
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(OBJCNR,ProcessDir,FillCnrsThread,ObjCnrDlgProc)