Changeset 2861 for trunk/kLdr/kLdr.h

Timestamp:

Nov 10, 2006, 4:04:42 AM (19 years ago)

Author:

bird

Message:

Put the PE module interpreter thru the wringer and learnt how much the window file mapping API sucks.

File:

• trunk/kLdr/kLdr.h (modified) (5 diffs)

trunk/kLdr/kLdr.h

@@ -87 +87 @@
 # define PRI_KLDRSIZE    "llx"
 #endif
+
+/** Pointer to a loader segment. */
+typedef struct KLDRSEG *PKLDRSEG;
+/** Pointer to a loader segment. */
+typedef const struct KLDRSEG *PCKLDRSEG;
+
 
 
@@ -167 +173 @@
     /** @copydoc kLdrRdrPageSize */
     size_t  (* pfnPageSize)(PKLDRRDR pRdr);
-    /** @copydoc kLdrRdrPrepare */
-    int     (* pfnPrepare)(PKLDRRDR pRdr, void **ppv, size_t cb, unsigned fFixed);
     /** @copydoc kLdrRdrMap */
-    int     (* pfnMap)(PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt, off_t offFile, size_t cbFile);
-    /** @copydoc kLdrRdrRefreshMap */
-    int     (* pfnRefreshMap)(PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt, off_t offFile, size_t cbFile);
+    int     (* pfnMap)(     PKLDRRDR pRdr, void **ppvBase, uint32_t cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+    /** @copydoc kLdrRdrRefresh */
+    int     (* pfnRefresh)( PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments);
     /** @copydoc kLdrRdrProtect */
-    int     (* pfnProtect)(PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt);
+    int     (* pfnProtect)( PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
     /** @copydoc kLdrRdrUnmap */
-    int     (* pfnUnmap)(PKLDRRDR pRdr, void *pv, size_t cb);
-    /** @copydoc kLdrRdrUnprepare */
-    int     (* pfnUnprepare)(PKLDRRDR pRdr, void *pv, size_t cb);
+    int     (* pfnUnmap)(   PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments);
     /** @copydoc kLdrRdrDone */
-    void    (* pfnDone)(PKLDRRDR pRdr);
+    void    (* pfnDone)(    PKLDRRDR pRdr);
     /** The usual non-zero dummy that makes sure we've initialized all members. */
     uint32_t u32Dummy;
@@ -215 +217 @@
 const char *kLdrRdrName(PKLDRRDR pRdr);
 size_t  kLdrRdrPageSize(PKLDRRDR pRdr);
-int     kLdrRdrPrepare( PKLDRRDR pRdr, void **ppv, size_t cb, unsigned fFixed);
-int     kLdrRdrMap(     PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt, off_t offFile, size_t cbFile);
-int     kLdrRdrRefreshMap(PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt, off_t offFile, size_t cbFile);
-int     kLdrRdrProtect( PKLDRRDR pRdr, void *pv, size_t cb, KLDRPROT enmProt);
-int     kLdrRdrUnmap(   PKLDRRDR pRdr, void *pv, size_t cb);
-int     kLdrRdrUnprepare(PKLDRRDR pRdr, void *pv, size_t cb);
+int     kLdrRdrMap(     PKLDRRDR pRdr, void **ppvBase, uint32_t cSegments, PCKLDRSEG paSegments, unsigned fFixed);
+int     kLdrRdrRefresh( PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments);
+int     kLdrRdrProtect( PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments, unsigned fUnprotectOrProtect);
+int     kLdrRdrUnmap(   PKLDRRDR pRdr, void *pvBase, uint32_t cSegments, PCKLDRSEG paSegments);
 void    kLdrRdrDone(    PKLDRRDR pRdr);
 
@@ -430 +430 @@
     uintptr_t       MapAddress;
 } KLDRSEG;
-/** Pointer to a loader segment. */
-typedef KLDRSEG *PKLDRSEG;
-/** Pointer to a loader segment. */
-typedef const KLDRSEG *PCKLDRSEG;
 
 
@@ -1029 +1025 @@
 /** Thread attach failed. */
 #define KLDR_ERR_THREAD_ATTACH_FAILED                       (KLDR_ERR_BASE + 57)
+/** The file reader can't take more concurrent mappings. */
+#define KLDR_ERR_TOO_MANY_MAPPINGS                          (KLDR_ERR_BASE + 58)