Changeset 985 for trunk/dll/dirsize.c

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

File:

• trunk/dll/dirsize.c (modified) (25 diffs)

trunk/dll/dirsize.c

@@ -31 +31 @@
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Add presparams & update appearence of "Sizes" dialog
 
 ***********************************************************************/
@@ -150 +152 @@
       strlen(pszFileName) < 4) {
     if (*pchStopFlag) {
-      free(pffbArray);
+      xfree(pffbArray);
       return FALSE;
     }
@@ -157 +159 @@
     if (!pci) {
       Win_Error(hwndCnr, HWND_DESKTOP, pszSrcFile, __LINE__, "CM_ALLOCRECORD");
-      free(pffbArray);
+      xfree(pffbArray);
       return FALSE;
     }
@@ -173 +175 @@
   else {
     // No match
-    free(pffbArray);
+    xfree(pffbArray);
     Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
               GetPString(IDS_CANTFINDDIRTEXT), pszFileName);
@@ -216 +218 @@
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
-    free(pffbArray);
+    xfree(pffbArray);
     return FALSE;
   }
@@ -278 +280 @@
   }
 
-  free(pffbArray);
+  xfree(pffbArray);
 
   pci->cbFile = ullCurDirBytes;
@@ -456 +458 @@
   PostMsg(WinQueryWindow(hwndCnr, QW_PARENT),
           UM_CONTAINER_FILLED, MPVOID, MPVOID);
-  free(dirsize);
+  xfree(dirsize);
 }
 
@@ -483 +485 @@
     {
       CHAR s[CCHMAXPATH + 81];
-
+      RestorePresParams(hwnd, "DirSizes");
       sprintf(s, GetPString(IDS_DIRSIZETITLETEXT), pState->szDirName);
       WinSetWindowText(hwnd, s);
+    }
+    {
+      SWP swp;
+      ULONG size = sizeof(SWP);
+
+      PrfQueryProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp, &size);
+      WinSetWindowPos(hwnd,
+                      HWND_TOP,
+                      swp.x,
+                      swp.y,
+                      swp.cx,
+                      swp.cy,
+                      swp.fl);
     }
     {
@@ -502 +517 @@
         Runtime_Error(pszSrcFile, __LINE__,
                       GetPString(IDS_COULDNTSTARTTHREADTEXT));
-        free(dirsize);
+        xfree(dirsize);
         WinDismissDlg(hwnd, 0);
         break;
@@ -614 +629 @@
     return 0;
 
+  case WM_PRESPARAMCHANGED:
+    PresParamChanged(hwnd, "DirSizes", mp1, mp2);
+    break;
+
   case WM_DRAWITEM:
     if (mp2) {
@@ -638 +657 @@
             p = strchr(pci->pszFileName, '\r');
             if (p) {
-              // draw text
-              if (!pci->cbFile)         // no size
+              // draw text
+              if (*(pci->pszLongName + 1) == 1)  // is root record
+                GpiSetColor(oi->hps, CLR_DARKRED);
+              else if (!pci->cbFile)            // no size
                 GpiSetColor(oi->hps, CLR_DARKGRAY);
               else if (!pci->easize)    // no size below
@@ -654 +675 @@
                               pci->pszFileName, TXTBOX_COUNT, aptl);
               boxHeight = aptl[TXTBOX_TOPRIGHT].y - aptl[TXTBOX_BOTTOMRIGHT].y;
-              boxHeight -= 6;
+              boxHeight -= 4;
 
               // Calculate nominal baseline of graph box
@@ -662 +683 @@
               // Place text above graph box with a bit of whitespace between
               ptl.x = oi->rclItem.xLeft;
-              ptl.y = yBottom + boxHeight + 8;  // 03 Aug 07 SHL
+              ptl.y = yBottom + boxHeight + 6;  // 03 Aug 07 SHL
               // GpiMove(oi->hps, &ptl);
               GpiCharStringAt(oi->hps, &ptl, strlen(pci->pszFileName),
@@ -676 +697 @@
               ptl.y = yBottom + 2;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 101;
+              ptl.x = oi->rclItem.xLeft + 201;
               ptl.y = yBottom + boxHeight;
               GpiBox(oi->hps, DRO_OUTLINE, &ptl, 0, 0);
@@ -684 +705 @@
               ptl.y = yBottom + 3;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 100;
+              ptl.x = oi->rclItem.xLeft + 200;
               ptl.y = yBottom + boxHeight - 1;
               GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
@@ -693 +714 @@
               ptl.y = yBottom + 3;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 100;
+              ptl.x = oi->rclItem.xLeft + 200;
               GpiLine(oi->hps, &ptl);
               ptl.y = yBottom + boxHeight - 1;
@@ -710 +731 @@
               ptl.y = yBottom + boxHeight;
               GpiMove(oi->hps, &ptl);
-              ptl.x = oi->rclItem.xLeft + 103;
+              ptl.x = oi->rclItem.xLeft + 203;
               GpiLine(oi->hps, &ptl);
               ptl.y = yBottom + boxHeight - 2;
@@ -727 +748 @@
                 else
                   GpiSetColor(oi->hps, CLR_RED);
-                ptl.x = oi->rclItem.xLeft + 1;
+                ptl.x = oi->rclItem.xLeft + 2;
                 ptl.y = yBottom + 3;
                 GpiMove(oi->hps, &ptl);
-                ptl.x = oi->rclItem.xLeft + pci->flags;
+                ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                 ptl.y = yBottom + boxHeight - 1;
                 GpiBox(oi->hps, DRO_OUTLINEFILL, &ptl, 0, 0);
@@ -750 +771 @@
                   GpiMove(oi->hps, &ptl);
                 }
-                ptl.x = oi->rclItem.xLeft + pci->flags;
+                ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                 GpiLine(oi->hps, &ptl);
                 if (*(pci->pszLongName + 1) != 1) {
@@ -757 +778 @@
                   ptl.y = yBottom + 3;
                   GpiMove(oi->hps, &ptl);
-                  ptl.x = oi->rclItem.xLeft + pci->flags;
+                  ptl.x = oi->rclItem.xLeft + pci->flags * 2;
                   GpiLine(oi->hps, &ptl);
                 }
@@ -765 +786 @@
               GpiSetColor(oi->hps, CLR_WHITE);
               clr = CLR_WHITE;
-              for (x = 1; x < 10; x++) {
-                if (clr == CLR_WHITE && x * 10 > pci->flags) {
+              for (x = 1; x < 20; x++) {
+                if (clr == CLR_WHITE && x * 10 > pci->flags * 2) {
                   clr = CLR_BLACK;
                   GpiSetColor(oi->hps, CLR_BLACK);
@@ -775 +796 @@
                 switch (x) {
                 case 1:
-                case 3:
+                case 3:
+                case 5:
                 case 7:
-                case 9:
+                case 9:
+                case 11:
+                case 13:
+                case 15:
+                case 17:
+                case 19:
                   ptl.y -= 1;
                   break;
-                case 5:
+                case 10:
                   ptl.y -= 4;
                   break;
@@ -786 +813 @@
                 case 4:
                 case 6:
-                case 8:
+                case 8:
+                case 12:
+                case 14:
+                case 16:
+                case 18:
                   ptl.y -= 2;
                   break;
@@ -943 +974 @@
     case DID_OK:
     case DID_CANCEL:
+      {
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        WinQueryWindowPos(hwnd, &swp);
+        PrfWriteProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp,
+                            size);
+      }
       pState = INSTDATA(hwnd);
       if (!pState)
@@ -973 +1012 @@
         WinDestroyPointer(pState->hptr);
       DosSleep(16); //05 Aug 07 GKY 33
-      free(pState);                     // Let's hope no one is still looking
+      xfree(pState);                    // Let's hope no one is still looking
     }
     DosPostEventSem(CompactSem);