Changeset 142 for trunk/src/helpers/exeh.c

Timestamp:

Feb 21, 2002, 8:24:22 PM (23 years ago)

Author:

umoeller

Message:

misc. updates

File:

• trunk/src/helpers/exeh.c (modified) (14 diffs)

trunk/src/helpers/exeh.c

@@ -546 +546 @@
  */
 
-VOID ParseBldLevel(PEXECUTABLE pExec)
+static VOID ParseBldLevel(PEXECUTABLE pExec)
 {
     PCSZ    pStartOfVendor,
@@ -703 +703 @@
  *      and pszInfo fields are also set. In the above examples,
  *      this would return the following information:
+ *
  +          pszVendor = "Ulrich M”ller"
  +          pszVersion = "0.9.0"
  +          pszInfo = "XWorkplace Sound Support Module"
+ *
+ *      See ParseBldLevel for extended formats.
  *
  *      If that string is not in BLDLEVEL format, only
@@ -1013 +1016 @@
  */
 
-APIRET ScanLXEntryTable(PEXECUTABLE pExec,
-                        PFSYSFUNCTION paFunctions,
-                        PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
+static APIRET ScanLXEntryTable(PEXECUTABLE pExec,
+                               PFSYSFUNCTION paFunctions,
+                               PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
 {
     ULONG  ulDummy;
@@ -1254 +1257 @@
  */
 
-APIRET ScanNEEntryTable(PEXECUTABLE pExec,
-                        PFSYSFUNCTION paFunctions,
-                        PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
+static APIRET ScanNEEntryTable(PEXECUTABLE pExec,
+                               PFSYSFUNCTION paFunctions,
+                               PULONG pcEntries)        // out: entry table entry count; ptr can be NULL
 {
     ULONG  ulDummy;
@@ -1349 +1352 @@
  */
 
-int _Optlink Compare(const void *key,
-                     const void *element)
+static int _Optlink Compare(const void *key,
+                            const void *element)
 {
     USHORT        usOrdinal = *((PUSHORT) key);
@@ -1378 +1381 @@
  */
 
-APIRET ScanNameTable(PEXECUTABLE pExec,
-                     ULONG cFunctions,
-                     PFSYSFUNCTION paFunctions)
+static APIRET ScanNameTable(PEXECUTABLE pExec,
+                            ULONG cFunctions,
+                            PFSYSFUNCTION paFunctions)
 {
     ULONG   ulDummy;
@@ -2135 +2138 @@
  */
 
-APIRET ExpandIterdata1(char *pabTarget,         // out: page data (pagesize as in lx spec)
-                       int cbTarget,            // in: sizeof *pabTarget (pagesize as in lx spec)
-                       const char *pabSource,   // in: compressed source data in EXEPACK:1 format
-                       int cbSource)            // in: sizeof *pabSource
+static APIRET ExpandIterdata1(char *pabTarget,         // out: page data (pagesize as in lx spec)
+                              int cbTarget,            // in: sizeof *pabTarget (pagesize as in lx spec)
+                              const char *pabSource,   // in: compressed source data in EXEPACK:1 format
+                              int cbSource)            // in: sizeof *pabSource
 {
     PLXITER             pIter = (PLXITER)pabSource;
@@ -2200 +2203 @@
  */
 
-void memcpyw(char *pch1, const char *pch2, size_t cch)
+static void memcpyw(char *pch1, const char *pch2, size_t cch)
 {
     /*
@@ -2234 +2237 @@
  */
 
-void memcpyb(char *pch1, const char *pch2, size_t cch)
+static void memcpyb(char *pch1, const char *pch2, size_t cch)
 {
     /*
@@ -2261 +2264 @@
  *      (C) Knut Stange Osmundsen. Used with permission.
  *
+ *      Note that we call special (slow) memcpy versions
+ *      here because the standard memcpy will fail on
+ *      certain bit combinations here for some unknown
+ *      reason.
+ *
  *@@added V0.9.16 (2001-12-08) [umoeller]
  */
 
-APIRET ExpandIterdata2(char *pachPage,
-                       int cchPage,
-                       const char *pachSrcPage,
-                       int cchSrcPage)
+static APIRET ExpandIterdata2(char *pachPage,              // out: page data (pagesize as in lx spec)
+                              int cchPage,                 // in: sizeof *pachPage (pagesize as in lx spec)
+                              const char *pachSrcPage,     // in: compressed source data in EXEPACK:1 format
+                              int cchSrcPage)              // in: size of source buf
 {
     char *          pachDestPage = pachPage; /* Store the pointer for boundrary checking. */
@@ -2479 +2487 @@
  */
 
-APIRET GetOfsFromPageTableIndex(PEXECUTABLE pExec,   // in: executable from exehOpen
-                                ULONG ulObjPageTblIndexThis,  // in: object page table index to look for
-                                PULONG pulFlags,        // out: page flags
-                                PULONG pulSize,         // out: page size
-                                PULONG pulPageOfs)      // out: page ofs (add pLXHeader->ulDataPagesOfs to this)
+static APIRET GetOfsFromPageTableIndex(PEXECUTABLE pExec,   // in: executable from exehOpen
+                                       ULONG ulObjPageTblIndexThis,  // in: object page table index to look for
+                                       PULONG pulFlags,        // out: page flags
+                                       PULONG pulSize,         // out: page size
+                                       PULONG pulPageOfs)      // out: page ofs (add pLXHeader->ulDataPagesOfs to this)
 {
     OBJECTPAGETABLEENTRY *pObjPageTblEntry;
@@ -2509 +2517 @@
  *      loads and possibly unpacks one LX page.
  *
+ *      In order to reduce memory allocations, the
+ *      caller is responsible for allocating a temp
+ *      buffer, which must be passed in with
+ *      pabCompressed.
+ *
+ *      Returns:
+ *
+ *      --  NO_ERROR: pbData was filled with data,
+ *          which is pLXHeader->ulPageSize in size.
+ *
+ *      --  ERROR_INVALID_SEGMENT_NUMBER: segment
+ *          number is out of range.
+ *
+ *      --  ERROR_BAD_FORMAT: compressed page data
+ *          is screwed somehow, or page size is
+ *          too large.
+ *
+ *      plus the error codes of doshReadAt.
+ *
  *@@added V0.9.16 (2002-01-05) [umoeller]
  */
 
-APIRET exehReadLXPage(PEXECUTABLE pExec,
-                      ULONG ulObjPageTblIndex,
+APIRET exehReadLXPage(PEXECUTABLE pExec,        // in: executable from exehOpen
+                      ULONG ulObjPageTblIndex,  // in: page table index to read
                       ULONG ulExeOffset,        // in: for resources, pLXHeader->ulDataPagesOfs
                       PBYTE pabCompressed,      // in: ptr to temp buffer which must be
                                                 // pLXHeader->ulPageSize + 4 bytes in size
-                      PBYTE pbData)             // in: ptr to buffer which receives actual
+                      PBYTE pbData)             // out: ptr to buffer which receives actual
                                                 // uncompressed page data (pLXHeader->ulPageSize)
 {
@@ -2617 +2644 @@
  *      --  ERROR_NOT_ENOUGH_MEMORY
  *
- *      --  ERROR_INVALID_SEGMENT_NUMBER
- *
- *      --  ERROR_BAD_FORMAT: cannot handle resource
- *          format (probably error in decompression
- *          code).
- *
- *      plus the error codes from doshReadAt.
+ *      plus the error codes from exehReadLXPage.
  *
  *@@added V0.9.16 (2001-12-08) [umoeller]
@@ -3143 +3164 @@
             {
                 free(pThis);
-                pThis = NULL;
+                *papsz[ul] = NULL;
             }
         }