Changeset 240 for trunk/src/helpers

Timestamp:

Jan 12, 2003, 11:49:24 AM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

Location:

trunk/src/helpers

Files:

• dosh.c (modified) (3 diffs)
• dosh2.c (modified) (2 diffs)
• exeh.c (modified) (2 diffs)
• gpih.c (modified) (3 diffs)
• procstat.c (modified) (2 diffs)
• stringh.c (modified) (1 diff)

trunk/src/helpers/dosh.c

@@ -1657 +1657 @@
        )
     {
-        CHAR szTemp[30] = "?:\\long.name.file";
+        CHAR szTemp[] = "?:\\long.name.file";
         szTemp[0]  = ulLogicalDrive + 'A' - 1;
         if (!(arc = DosOpen(szTemp,
@@ -4014 +4014 @@
  +      PDOSHPERFSYS pPerf = NULL;
  +      APIRET arc;
- +      if (!(arc = arc = doshPerfOpen(&pPerf)))
+ +      if (!(arc = doshPerfOpen(&pPerf)))
  +      {
  +          // this should really be in a timer,
@@ -4043 +4043 @@
 
     // allocate DOSHPERFSYS structure
-    *ppPerfSys = (PDOSHPERFSYS)malloc(sizeof(DOSHPERFSYS));
-    if (!*ppPerfSys)
+    if (!(*ppPerfSys = (PDOSHPERFSYS)malloc(sizeof(DOSHPERFSYS))))
         arc = ERROR_NOT_ENOUGH_MEMORY;
     else

trunk/src/helpers/dosh2.c

@@ -383 +383 @@
     }
 
-    return(ERROR_BUFFER_OVERFLOW);
+    return ERROR_BUFFER_OVERFLOW;
 }
 
@@ -607 +607 @@
     {
         // try additional things then
-        PSZ psz2 = (PSZ)malloc(strlen(pcszCommand) + 20);
-        if (psz2)
+        PSZ psz2;
+        if (psz2 = (PSZ)malloc(strlen(pcszCommand) + 20))
         {
             ULONG   ul;

trunk/src/helpers/exeh.c

@@ -257 +257 @@
                               &cbFile,
                               &pFile)))
-            // file opened successfully:
        )
     {
+        // file opened successfully:
         pExec->pFile = pFile;
         pExec->cbDosExeHeader = sizeof(DOSEXEHEADER);
@@ -505 +505 @@
     } // end if (fLoadNewHeader)
 
-    if (arc != NO_ERROR)
+    if (arc)
         // error: clean up
         exehClose(&pExec);

trunk/src/helpers/gpih.c

@@ -2807 +2807 @@
  *
  *      This function may relieve this a bit. This
- *      creates a memory DC, an memory PS, and a bitmap,
+ *      creates a memory DC, a memory PS, and a bitmap,
  *      and selects the bitmap into the memory PS.
  *      You can then use any GPI function on the memory
@@ -2820 +2820 @@
  *      Example:
  *
- +          PXBITMAP pbmp = gpihCreateXBitmap(hab, 100, 100);
- +          if (pbmp)
+ +          PXBITMAP pbmp;
+ +          if (pbmp = gpihCreateXBitmap(hab, 100, 100))
  +          {
  +              GpiMove(pbmp->hpsMem, ...);
@@ -2845 +2845 @@
 {
     BOOL fOK = FALSE;
-    PXBITMAP pbmp = (PXBITMAP)malloc(sizeof(XBITMAP));
-    if (pbmp)
+    PXBITMAP pbmp;
+    if (pbmp = (PXBITMAP)malloc(sizeof(XBITMAP)))
     {
         memset(pbmp, 0, sizeof(XBITMAP));

trunk/src/helpers/procstat.c

@@ -497 +497 @@
 
 /*
+ *@@ prc32GetInfo2:
+ *      nifty interface to DosQuerySysState, the 32-bit
+ *      version of DosQProcStat.
+ *
+ *      This returns the head of a newly allocated buffer
+ *      which has plenty of pointers for subsequent browing.
+ *
+ *      As opposed to prc32GetInfo, with this call you can
+ *      specify the information that would like to retrieve.
+ *
+ *      Use prc32FreeInfo to free the buffer.
+ *
+ *@@added V1.0.1 (2003-01-10) [umoeller]
+ */
+
+PQTOPLEVEL32 prc32GetInfo2(ULONG fl,        // in: QS32_* flags
+                           APIRET *parc)    // out: error, ptr can be NULL
+{
+    APIRET          arc;
+    PQTOPLEVEL32    pReturn = NULL;
+
+    #define BUFSIZE (1024 * 1024) // 1 meg
+
+    if (!(arc = DosAllocMem((PVOID*)&pReturn,
+                            BUFSIZE,
+                            PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_TILE)))
+    {
+        if (arc = DosQuerySysState(fl,
+                                   fl,      // this was missing V0.9.10 (2001-04-08) [umoeller]
+                                   0, 0,
+                                   (PCHAR)pReturn,
+                                   BUFSIZE))
+        {
+            DosFreeMem(pReturn);
+            pReturn = NULL;
+        }
+    }
+
+    if (parc)
+        *parc = arc;
+
+    return pReturn;
+}
+
+/*
  *@@ prc32GetInfo:
- *      nifty interface to DosQuerySysState,
- *      the 32-bit version of DosQProcStat.
- *      This returns the head of a newly
- *      allocated buffer which has plenty
- *      of pointers for subsequent browing.
+ *      nifty interface to DosQuerySysState, the 32-bit
+ *      version of DosQProcStat.
+ *
+ *      This returns the head of a newly allocated buffer
+ *      which has plenty of pointers for subsequent browing.
  *
  *      Use prc32FreeInfo to free the buffer.
@@ -513 +558 @@
 PQTOPLEVEL32 prc32GetInfo(APIRET *parc)     // out: error, ptr can be NULL
 {
-    #define BUFSIZE (1024 * 1024) // 1 meg
-
-    PCHAR pBuf = NULL; // (PCHAR)malloc(BUFSIZE);
-
-    if (DosAllocMem((PVOID*)&pBuf,
-                    BUFSIZE,
-                    PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_TILE)
-            == NO_ERROR)
-        if (pBuf)
-        {
-            APIRET arc = DosQuerySysState(QS32_SUPPORTED,
-                                          QS32_SUPPORTED,       // this was missing
-                                                                // V0.9.10 (2001-04-08) [umoeller]
-                                          0, 0,
-                                          (PCHAR)pBuf,
-                                          BUFSIZE);
-            if (parc)
-                *parc = arc;
-
-            if (arc == NO_ERROR)
-                return (PQTOPLEVEL32)pBuf;
-            else
-                DosFreeMem(pBuf);
-        }
-
-    return NULL;
+    return prc32GetInfo2(QS32_SUPPORTED,
+                         parc);
 }
 

trunk/src/helpers/stringh.c

@@ -178 +178 @@
     *string1 = '\0';
     return string1;
+}
+
+/*
+ *@@ strhCopyBuf:
+ *      copies pcszSource to pszTarget, taking
+ *      its length into account.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR
+ *
+ *      --  ERROR_INVALID_PARAMETER: pcszSource is
+ *          null or points to a null byte.
+ *
+ *      --  ERROR_FILENAME_EXCED_RANGE: pcszSource
+ *          is too long to fit into pszTarget.
+ *
+ *@@added V1.0.1 (2003-01-05) [umoeller]
+ */
+
+APIRET strhCopyBuf(PSZ pszTarget,
+                   PCSZ pcszSource,
+                   ULONG cbTarget)
+{
+    ULONG cb;
+    if (!pcszSource || !*pcszSource)
+        return ERROR_INVALID_PARAMETER;
+    cb = strlen(pcszSource) + 1;
+    if (cb > cbTarget)
+        return ERROR_FILENAME_EXCED_RANGE;
+
+    memcpy(pszTarget,
+           pcszSource,
+           cb);
+    return NO_ERROR;
 }