Changeset 108 for trunk/src/helpers/dosh.c

Timestamp:

Oct 13, 2001, 7:57:58 PM (24 years ago)

Author:

umoeller

Message:

Lots of updates from the last week for conditional compiles and other stuff.

File:

• trunk/src/helpers/dosh.c (modified) (10 diffs)

trunk/src/helpers/dosh.c

@@ -69 +69 @@
 #pragma hdrstop
 
-static const CHAR  G_acDriveLetters[28] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+// static const CHAR  G_acDriveLetters[28] = " ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
 /*
@@ -703 +703 @@
             PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)fsqBuffer;
 
-            szName[0] = G_acDriveLetters[ulLogicalDrive];
+            szName[0] = ulLogicalDrive + 'A' - 1;
             szName[1] = ':';
             szName[2] = '\0';
@@ -753 +753 @@
                     &ulBootDrive,
                     sizeof(ulBootDrive));
-    return (G_acDriveLetters[ulBootDrive]);
+    return (ulBootDrive + 'A' - 1);
 }
 
@@ -1034 +1034 @@
  *@@changed V0.9.1 (99-12-12) [umoeller]: added cbBuf to prototype
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed, this never respected cbBuf
+ *@@changed V0.9.16 (2001-10-02) [umoeller]: added check for valid logical disk no
  */
 
@@ -1048 +1049 @@
 
     // compose "D:"-type string from logical drive letter
-    szName[0] = G_acDriveLetters[ulLogicalDrive];
-    szName[1] = ':';
-    szName[2] = '\0';
-
-    arc = DosQueryFSAttach(szName,          // logical drive of attached FS ("D:"-style)
-                           0,               // ulOrdinal, ignored for FSAIL_QUERYNAME
-                           FSAIL_QUERYNAME, // return name for a drive or device
-                           pfsqBuffer,      // buffer for returned data
-                           &cbBuffer);      // sizeof(*pfsqBuffer)
-
-    if (arc == NO_ERROR)
-    {
-        if (pszBuf)
+    if (ulLogicalDrive > 0 && ulLogicalDrive < 27)
+    {
+        szName[0] = ulLogicalDrive + 'A' - 1;
+        szName[1] = ':';
+        szName[2] = '\0';
+
+        arc = DosQueryFSAttach(szName,          // logical drive of attached FS ("D:"-style)
+                               0,               // ulOrdinal, ignored for FSAIL_QUERYNAME
+                               FSAIL_QUERYNAME, // return name for a drive or device
+                               pfsqBuffer,      // buffer for returned data
+                               &cbBuffer);      // sizeof(*pfsqBuffer)
+
+        if (arc == NO_ERROR)
         {
-            // The data for the last three fields in the FSQBUFFER2
-            // structure are stored at the offset of fsqBuffer.szName.
-            // Each data field following fsqBuffer.szName begins
-            // immediately after the previous item.
-            strncpy(pszBuf,
-                    (CHAR*)(&pfsqBuffer->szName) + pfsqBuffer->cbName + 1,
-                    cbBuf);         // V0.9.14 (2001-08-01) [umoeller]
-            *(pszBuf + cbBuf) = '\0';
+            if (pszBuf)
+            {
+                // The data for the last three fields in the FSQBUFFER2
+                // structure are stored at the offset of fsqBuffer.szName.
+                // Each data field following fsqBuffer.szName begins
+                // immediately after the previous item.
+                strncpy(pszBuf,
+                        (CHAR*)(&pfsqBuffer->szName) + pfsqBuffer->cbName + 1,
+                        cbBuf);         // V0.9.14 (2001-08-01) [umoeller]
+                *(pszBuf + cbBuf) = '\0';
+            }
         }
     }
+    else
+        arc = ERROR_INVALID_PARAMETER; // V0.9.16 (2001-10-02) [umoeller]
 
     return (arc);
@@ -1883 +1889 @@
         ULONG   cbWritten;
         DosGetDateTime(&dt);
-        sprintf(szTemp, "Time: %02d:%02d:%02d %s",
-            dt.hours, dt.minutes, dt.seconds,
-            pcsz);
+        sprintf(szTemp,
+                "Time: %02d:%02d:%02d %s",
+                dt.hours, dt.minutes, dt.seconds,
+                pcsz);
         return (DosWrite(hfLog, (PVOID)szTemp, strlen(szTemp), &cbWritten));
     }
@@ -2000 +2007 @@
     ULONG   ulCurDisk = 0;
     ULONG   ulMap = 0;
-    arc = DosQueryCurrentDisk(&ulCurDisk, &ulMap);
-    if (arc == NO_ERROR)
+    if (!(arc = DosQueryCurrentDisk(&ulCurDisk, &ulMap)))
     {
         ULONG   cbBuf = CCHMAXPATH - 3;
-        *pszBuf = G_acDriveLetters[ulCurDisk];
+        *pszBuf = ulCurDisk + 'A' - 1;
         *(pszBuf + 1) = ':';
         *(pszBuf + 2) = '\\';
@@ -2270 +2276 @@
 
         // resolve DosPerfSysCall API entry
-        arc = DosLoadModule(NULL, 0, "DOSCALLS", &pPerfSys->hmod);
-        if (arc == NO_ERROR)
+        if (!(arc = DosLoadModule(NULL, 0, "DOSCALLS", &pPerfSys->hmod)))
         {
-            arc = DosQueryProcAddr(pPerfSys->hmod,
-                                   976,
-                                   "DosPerfSysCall",
-                                   (PFN*)(&pPerfSys->pDosPerfSysCall));
-            if (arc == NO_ERROR)
+            if (!(arc = DosQueryProcAddr(pPerfSys->hmod,
+                                         976,
+                                         "DosPerfSysCall",
+                                         (PFN*)(&pPerfSys->pDosPerfSysCall))))
             {
                 // OK, we got the API: initialize!
-                arc = pPerfSys->pDosPerfSysCall(CMD_KI_ENABLE, 0, 0, 0);
-                if (arc == NO_ERROR)
+                if (!(arc = pPerfSys->pDosPerfSysCall(CMD_KI_ENABLE, 0, 0, 0)))
                 {
                     pPerfSys->fInitialized = TRUE;
                             // call CMD_KI_DISABLE later
 
-                    arc = pPerfSys->pDosPerfSysCall(CMD_PERF_INFO,
-                                                    0,
-                                                    (ULONG)(&pPerfSys->cProcessors),
-                                                    0);
-                    if (arc == NO_ERROR)
+                    if (!(arc = pPerfSys->pDosPerfSysCall(CMD_PERF_INFO,
+                                                          0,
+                                                          (ULONG)(&pPerfSys->cProcessors),
+                                                          0)))
                     {
-                        ULONG   ul = 0;
+                        ULONG   ul = 0,
+                                cProcs = pPerfSys->cProcessors,
+                                cbDouble = cProcs * sizeof(double),
+                                cbLong = cProcs * sizeof(LONG);
 
                         // allocate arrays
-                        pPerfSys->paCPUUtils = (PCPUUTIL)calloc(pPerfSys->cProcessors,
-                                                                sizeof(CPUUTIL));
-                        if (!pPerfSys->paCPUUtils)
+                        if (    (!(pPerfSys->paCPUUtils = (PCPUUTIL)calloc(cProcs,
+                                                                sizeof(CPUUTIL))))
+                             || (!(pPerfSys->padBusyPrev
+                                    = (double*)malloc(cbDouble)))
+                             || (!(pPerfSys->padTimePrev
+                                    = (double*)malloc(cbDouble)))
+                             || (!(pPerfSys->padIntrPrev
+                                    = (double*)malloc(cbDouble)))
+                             || (!(pPerfSys->palLoads
+                                    = (PLONG)malloc(cbLong)))
+                             || (!(pPerfSys->palIntrs
+                                    = (PLONG)malloc(cbLong)))
+                           )
                             arc = ERROR_NOT_ENOUGH_MEMORY;
                         else
                         {
-                            pPerfSys->padBusyPrev = (double*)malloc(pPerfSys->cProcessors * sizeof(double));
-                            if (!pPerfSys->padBusyPrev)
-                                arc = ERROR_NOT_ENOUGH_MEMORY;
-                            else
+                            for (ul = 0; ul < cProcs; ul++)
                             {
-                                pPerfSys->padTimePrev
-                                    = (double*)malloc(pPerfSys->cProcessors * sizeof(double));
-                                if (!pPerfSys->padTimePrev)
-                                    arc = ERROR_NOT_ENOUGH_MEMORY;
-                                else
-                                {
-                                    pPerfSys->padIntrPrev
-                                        = (double*)malloc(pPerfSys->cProcessors * sizeof(double));
-                                    if (!pPerfSys->padIntrPrev)
-                                        arc = ERROR_NOT_ENOUGH_MEMORY;
-                                    else
-                                    {
-                                        pPerfSys->palLoads = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
-                                        if (!pPerfSys->palLoads)
-                                            arc = ERROR_NOT_ENOUGH_MEMORY;
-                                        else
-                                        {
-                                            pPerfSys->palIntrs = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
-                                            if (!pPerfSys->palIntrs)
-                                                arc = ERROR_NOT_ENOUGH_MEMORY;
-                                            else
-                                            {
-                                                for (ul = 0; ul < pPerfSys->cProcessors; ul++)
-                                                {
-                                                    pPerfSys->padBusyPrev[ul] = 0.0;
-                                                    pPerfSys->padTimePrev[ul] = 0.0;
-                                                    pPerfSys->padIntrPrev[ul] = 0.0;
-                                                    pPerfSys->palLoads[ul] = 0;
-                                                    pPerfSys->palIntrs[ul] = 0;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
+                                pPerfSys->padBusyPrev[ul] = 0.0;
+                                pPerfSys->padTimePrev[ul] = 0.0;
+                                pPerfSys->padIntrPrev[ul] = 0.0;
+                                pPerfSys->palLoads[ul] = 0;
+                                pPerfSys->palIntrs[ul] = 0;
                             }
                         }
@@ -2347 +2330 @@
         } // end if (arc == NO_ERROR)
 
-        if (arc != NO_ERROR)
-        {
+        if (arc)
+            // error: clean up
             doshPerfClose(ppPerfSys);
-        }
+
     } // end else if (!*ppPerfSys)
 
@@ -2405 +2388 @@
     else
     {
-        arc = pPerfSys->pDosPerfSysCall(CMD_KI_RDCNT,
-                                        (ULONG)pPerfSys->paCPUUtils,
-                                        0, 0);
-        if (arc == NO_ERROR)
+        if (!(arc = pPerfSys->pDosPerfSysCall(CMD_KI_RDCNT,
+                                              (ULONG)pPerfSys->paCPUUtils,
+                                              0, 0)))
         {
             // go thru all processors