Changeset 110

Timestamp:

Oct 15, 2001, 11:17:25 PM (24 years ago)

Author:

umoeller

Message:

Misc updates.

Location:

trunk/src/helpers

Files:

• dosh2.c (modified) (1 diff)
• eah.c (modified) (2 diffs)
• shapewin.c (modified) (1 diff)
• wphandle.c (modified) (7 diffs)
• xstring.c (modified) (1 diff)

trunk/src/helpers/dosh2.c

@@ -2255 +2255 @@
 
     // get the PATH value
-    PSZ pszPath;
+    PCSZ pcszPathValue;
     if (!(arc = DosScanEnv((PSZ)pcszPath,
-                           &pszPath)))
+#if __cplusplus
+                           &pcszPathValue)))
+#else
+                           (PSZ*)&pcszPathValue)))
+#endif
     {
         // run thru the path components
         PSZ pszPathCopy;
-        if (pszPathCopy = strdup(pszPath))
+        if (pszPathCopy = strdup(pcszPathValue))
         {
             PSZ pszToken = strtok(pszPathCopy, ";");
-            while (pszToken)        // V0.9.12 (2001-05-03) [umoeller]
+            while (pszToken)
             {
                 CHAR szFileMask[2*CCHMAXPATH];

trunk/src/helpers/eah.c

@@ -203 +203 @@
     FILEFINDBUF4   ffb4;
 
-    arc = DosQueryPathInfo((PSZ)pcszPath,
-                           FIL_QUERYEASIZE,
-                           &ffb4,
-                           sizeof(FILEFINDBUF4));
-
-    if (arc == NO_ERROR)
-    {
-        // CHAR szFile[CCHMAXPATH];
-        // PBYTE pbBuffer = malloc(ffb4.cbList);
+    if (!(arc = DosQueryPathInfo((PSZ)pcszPath,
+                                 FIL_QUERYEASIZE,
+                                 &ffb4,
+                                 sizeof(FILEFINDBUF4))))
+    {
         BYTE abBuf[2000];
         LONG lCount = 0;
@@ -218 +214 @@
         lCount = -1;
 
-        arc = DosEnumAttribute(ENUMEA_REFTYPE_PATH,
-                               (PSZ)pcszPath,
-                               1,
-                               abBuf,
-                               sizeof(abBuf),
-                               (PULONG)&lCount,
-                               ENUMEA_LEVEL_NO_VALUE);
+        if (!(arc = DosEnumAttribute(ENUMEA_REFTYPE_PATH,
+                                     (PSZ)pcszPath,
+                                     1,
+                                     abBuf,
+                                     sizeof(abBuf),
+                                     (PULONG)&lCount,
+                                     ENUMEA_LEVEL_NO_VALUE)))
+        {
             // ulCount now contains the EA count
 
-        pdena2 = (PDENA2)abBuf;
-
-        if (lCount > 0)
-        {
-            ulTotalEASize = pdena2->cbName + 8;
-
-            while (lCount > 0)
+            pdena2 = (PDENA2)abBuf;
+
+            if (lCount > 0)
             {
-                ulTotalEASize += (pdena2->cbValue + sizeof(DENA2));
-                lCount--;
-                pdena2 = (PDENA2) (((PBYTE) pdena2) +
-                              pdena2->oNextEntryOffset);
-
+                ulTotalEASize = pdena2->cbName + 8;
+
+                while (lCount > 0)
+                {
+                    ulTotalEASize += (pdena2->cbValue + sizeof(DENA2));
+                    lCount--;
+                    pdena2 = (PDENA2) (((PBYTE) pdena2) +
+                                  pdena2->oNextEntryOffset);
+
+                }
             }
         }

trunk/src/helpers/shapewin.c

@@ -1374 +1374 @@
                 // load resource bitmap
                 psb->hbm = GpiLoadBitmap(psb->hps,
-                                             hmodResource,
-                                             idResource,
-                                             0, 0);
+                                         hmodResource,
+                                         idResource,
+                                         0, 0);
             if (psb->hbm)
             {

trunk/src/helpers/wphandle.c

@@ -99 +99 @@
 
 APIRET wphQueryActiveHandles(HINI hiniSystem,
-                             PSZ *ppszActiveHandles)
+                             PSZ *ppszActiveHandles)        // out: active handles string (new buffer)
 {
     PSZ pszActiveHandles;
@@ -231 +231 @@
                 // store PNODE in hash table
                 pHandlesBuf->NodeHashTable[pNode->usHandle] = pNode;
-                pCur += sizeof (NODE) + pNode->usNameSize;
+                pCur += sizeof(NODE) + pNode->usNameSize;
             }
             else
@@ -341 +341 @@
                         ULONG   cbTotalOld = cbTotal;
                         cbTotal += cbBlockThis;
-                        if (!(pbData = realloc(pbData, cbTotal)))
+                        if (!(pbData = (BYTE*)realloc(pbData, cbTotal)))
                                 // on first call, pbData is NULL and this
                                 // behaves like malloc()
@@ -417 +417 @@
     return (arc);
 }
-
-/*
- *@@ wphReadAllBlocks:
- *      this reads all the BLOCK's in the active handles
- *      section in OS2SYS.INI into one common buffer, for
- *      which sufficient memory is allocated.
- *
- *      Each of these blocks is a maximum of 64 KB, hell
- *      knows why, maybe the INIs can't handle more. This
- *      func combines all the BLOCK's into one buffer anyways,
- *      which can then be searched.
- *
- *      Use wphQueryActiveHandles to pass the active handles
- *      section to this function.
- *
- *      This gets called by the one-shot function
- *      wphQueryHandleFromPath.
- */
-
-/* BOOL wphReadAllBlocks(HINI hiniSystem,       // in: can be HINI_USER or HINI_SYSTEM
-                      PSZ pszActiveHandles,  // in: active handles section
-                      PBYTE* ppBlock,        // in/out: pointer to buffer, which
-                                             //    will point to the allocated
-                                             //    memory afterwards
-                      PULONG pulSize)        // out: size of the allocated buffer
-{
-    PBYTE   pbAllBlocks,
-            pszBlockName,
-            p;
-    ULONG   ulBlockSize;
-    ULONG   ulTotalSize;
-    BYTE    rgfBlock[100];
-    BYTE    szAppName[10];
-    USHORT  usBlockNo;
-
-    pbAllBlocks = wphEnumProfileKeys(hiniSystem, pszActiveHandles, &ulBlockSize);
-    if (!pbAllBlocks)
-       return FALSE;
-
-    // query size of all individual blocks and calculate total
-    memset(rgfBlock, 0, sizeof rgfBlock);
-    ulTotalSize = 0L;
-    pszBlockName = pbAllBlocks;
-    while (*pszBlockName)
-    {
-        if (!memicmp(pszBlockName, "BLOCK", 5))
-        {
-           usBlockNo = atoi(pszBlockName + 5);
-           if (usBlockNo < 100)
-           {
-               rgfBlock[usBlockNo] = TRUE;
-
-               if (!PrfQueryProfileSize(hiniSystem,
-                                        pszActiveHandles,
-                                        pszBlockName,
-                                        &ulBlockSize))
-               {
-                   free(pbAllBlocks);
-                   return FALSE;
-               }
-               ulTotalSize += ulBlockSize;
-           }
-        }
-        pszBlockName += strlen(pszBlockName) + 1;
-    }
-
-    // *pulSize now contains the total size of all blocks
-    *ppBlock = (PBYTE)malloc(ulTotalSize);
-    if (!(*ppBlock))
-    {
-         free(pbAllBlocks);
-         return FALSE;
-    }
-
-    // now get all blocks into the memory we allocated
-    p = *ppBlock;
-    (*pulSize) = 0;
-    for (usBlockNo = 1; usBlockNo < 100; usBlockNo++)
-    {
-        if (!rgfBlock[usBlockNo])
-            break;
-
-        sprintf(szAppName, "BLOCK%u", (UINT)usBlockNo);
-        ulBlockSize = ulTotalSize;
-        if (!PrfQueryProfileData(hiniSystem,
-                                 pszActiveHandles,
-                                 szAppName,
-                                 p,
-                                 &ulBlockSize))
-        {
-            free(pbAllBlocks);
-            free(*ppBlock);
-            return FALSE;
-        }
-        p += ulBlockSize;
-        (*pulSize) += ulBlockSize;
-        ulTotalSize -= ulBlockSize;
-    }
-
-    free(pbAllBlocks);
-    return TRUE;
-} */
 
 /* ******************************************************************
@@ -688 +586 @@
 {
     APIRET      arc = NO_ERROR;
-    PVOID       pvData;
+
+    PSZ         pszActiveHandles = NULL;
+    PHANDLESBUF pHandlesBuf = NULL;
 
     TRY_LOUD(excpt1)
     {
         // not found there: check the handles then
-        PSZ pszActiveHandles;
+
         if (arc = wphQueryActiveHandles(hiniSystem, &pszActiveHandles))
             _Pmpf((__FUNCTION__ ": wphQueryActiveHandles returned %d", arc));
         else
         {
-            PHANDLESBUF pHandlesBuf;
             if (arc = wphLoadHandles(hiniUser,
                                      hiniSystem,
@@ -719 +618 @@
                 else
                     arc = ERROR_FILE_NOT_FOUND;
-
-                wphFreeHandles(&pHandlesBuf);
-            }
-
-            free(pszActiveHandles);
+            }
         }
     }
@@ -730 +625 @@
         arc = ERROR_WPH_CRASHED;
     } END_CATCH();
+
+    if (pszActiveHandles)
+        free(pszActiveHandles);
+    if (pHandlesBuf)
+        wphFreeHandles(&pHandlesBuf);
 
     return (arc);

trunk/src/helpers/xstring.c

@@ -396 +396 @@
        )
     {
-        pxstr->psz = realloc(pxstr->psz,
-                             pxstr->ulLength + 1);
+        pxstr->psz = (PSZ)realloc(pxstr->psz,
+                                  pxstr->ulLength + 1);
         pxstr->cbAllocated = pxstr->ulLength + 1;
     }