Changeset 1335 for trunk/dll/dirsize.c

Timestamp:

Dec 13, 2008, 12:49:02 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 26: Add exception handlers to all threads using xbeginthread

File:

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

trunk/dll/dirsize.c

@@ -35 +35 @@
   07 Jul 08 GKY Fixed trap in PMCTLS (strlen) inadequate memory allocation
   07 Jul 08 GKY Fixed trap by no longer allocating pci->pszLongName as flag but pointing isroot
-                version to NullStr and all others to NULL.
+                version to NullStr and all others to NULL.
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory; use pTmpDir for temp files
   03 Aug 08 GKY Reworked FillInRecSizes to use pci->pszDisplayName for display names and
-                created a more consitent string for passing to DRAWITEM. Finally (I hope) fixed
-                the strlen trap.
+                created a more consitent string for passing to DRAWITEM. Finally (I hope) fixed
+                the strlen trap.
   23 Aug 08 GKY Fix memory leak (failure to free cnritems)
+  10 Dec 08 SHL Integrate exception handler support
 
 ***********************************************************************/
@@ -47 +48 @@
 #include <string.h>
 #include <ctype.h>
-#include <process.h>                    // _beginthread
+// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -80 +81 @@
 #include "misc.h"                       // PostMsg
 #include "fortify.h"
+#include "excputil.h"                   // xbeginthread
 
 typedef struct
@@ -142 +144 @@
   /*if (!stricmp(FileSystem, NTFS)) {
     saymsg(MB_OK,
-           HWND_DESKTOP,
-           NullStr,
-           GetPString(IDS_NTFSDRIVERFAILSTEXT));
+           HWND_DESKTOP,
+           NullStr,
+           GetPString(IDS_NTFSDRIVERFAILSTEXT));
     return FALSE;
   } */
@@ -343 +345 @@
       if (isroot) {
         FSALLOCATE fsa;
-        APIRET rc;
-
-
-        memset(&fsa, 0, sizeof(fsa));
+        APIRET rc;
+
+
+        memset(&fsa, 0, sizeof(fsa));
         rc = DosQueryFSInfo(toupper(*pci->pszFileName) - '@', FSIL_ALLOC, &fsa,
                             sizeof(FSALLOCATE));
@@ -353 +355 @@
             ((float)fsa.cUnit * (fsa.cSectorUnit * fsa.cbSector));
         }
-        // Need unique buffer 23 Jul 07 SHL
-        pci->pszLongName = NullStr;
+        // Need unique buffer 23 Jul 07 SHL
+        pci->pszLongName = NullStr;
       }
       else
@@ -363 +365 @@
       cBar = (UINT) fltPct / 2;
       if (cBar && cBar * 2 != (UINT) fltPct)
-        szBar[cBar] = '=';
+        szBar[cBar] = '=';
       szBar[100] = 0;
     }
@@ -378 +380 @@
             fltPct,
             isroot ? GetPString(IDS_OFDRIVETEXT) : NullStr,
-            szBar);
+            szBar);
     pci->pszDisplayName = xstrdup(szBuf, pszSrcFile, __LINE__);
     // use DisplayName for display hopefully fixes "strlen" trap 02 AUG 08 GKY
@@ -393 +395 @@
     attrib = CMA_FIRST;
   pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
-                              MPFROM2SHORT(attrib, CMA_ITEMORDER));
+                              MPFROM2SHORT(attrib, CMA_ITEMORDER));
   while (pci && (INT) pci != -1) {
     if (*pchStopFlag)
@@ -525 +527 @@
       PrfQueryProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp, &size);
       WinSetWindowPos(hwnd,
-                      HWND_TOP,
-                      swp.x,
-                      swp.y,
-                      swp.cx,
-                      swp.cy,
-                      swp.fl);
+                      HWND_TOP,
+                      swp.x,
+                      swp.y,
+                      swp.cx,
+                      swp.cy,
+                      swp.fl);
     }
     {
@@ -543 +545 @@
       dirsize->pszFileName = pState->szDirName;
       dirsize->hwndCnr = WinWindowFromID(hwnd, DSZ_CNR);
-      if (_beginthread(FillCnrThread, NULL, 122880L * 5, (PVOID)dirsize) ==
-          -1) {
-        Runtime_Error(pszSrcFile, __LINE__,
-                      GetPString(IDS_COULDNTSTARTTHREADTEXT));
+      if (xbeginthread(FillCnrThread,
+                       122880 * 5,
+                       dirsize,
+                       pszSrcFile,
+                       __LINE__) == -1)
+      {
         xfree(dirsize, pszSrcFile, __LINE__);
         WinDismissDlg(hwnd, 0);
@@ -687 +691 @@
             p = strchr(pci->pszDisplayName, '\r');
             if (p) {
-              // draw text
-              if (pci->pszLongName == NullStr)  // is root record
-                GpiSetColor(oi->hps, CLR_DARKRED);
+              // draw text
+              if (pci->pszLongName == NullStr)  // is root record
+                GpiSetColor(oi->hps, CLR_DARKRED);
               else if (!pci->cbFile)            // no size
                 GpiSetColor(oi->hps, CLR_DARKGRAY);
@@ -826 +830 @@
                 switch (x) {
                 case 1:
-                case 3:
-                case 5:
+                case 3:
+                case 5:
                 case 7:
-                case 9:
-                case 11:
-                case 13:
-                case 15:
-                case 17:
-                case 19:
+                case 9:
+                case 11:
+                case 13:
+                case 15:
+                case 17:
+                case 19:
                   ptl.y -= 1;
                   break;
@@ -843 +847 @@
                 case 4:
                 case 6:
-                case 8:
-                case 12:
-                case 14:
-                case 16:
-                case 18:
+                case 8:
+                case 12:
+                case 14:
+                case 16:
+                case 18:
                   ptl.y -= 2;
                   break;
@@ -854 +858 @@
               } // for x
               return MRFROMLONG(TRUE);
-            }
+            }
           }
         }
@@ -948 +952 @@
         FILE *fp;
 
-        if (pTmpDir)
-          strcpy(szFileName, pTmpDir);
-        else
-          strcpy(szFileName, pFM2SaveDirectory);
+        if (pTmpDir)
+          strcpy(szFileName, pTmpDir);
+        else
+          strcpy(szFileName, pFM2SaveDirectory);
         sprintf(&szFileName[strlen(szFileName)], "\\%csizes.Rpt",
                 (pState) ? toupper(*pState->szDirName) : '+');
@@ -1007 +1011 @@
     case DID_CANCEL:
       {
-        SWP swp;
-        ULONG size = sizeof(SWP);
-
-        WinQueryWindowPos(hwnd, &swp);
-        PrfWriteProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp,
-                            size);
+        SWP swp;
+        ULONG size = sizeof(SWP);
+
+        WinQueryWindowPos(hwnd, &swp);
+        PrfWriteProfileData(fmprof, FM3Str, "DirSizes.Position", (PVOID) &swp,
+                            size);
       }
       pState = INSTDATA(hwnd);