Changeset 1454 for trunk/src/emx/include/os2emx.h

Timestamp:

Sep 4, 2004, 8:22:38 AM (21 years ago)

Author:

bird

Message:

Joined with the fork() tree from netlabs.cvs.

File:

• trunk/src/emx/include/os2emx.h (modified) (5 diffs, 1 prop)

trunk/src/emx/include/os2emx.h

@@ -1416 +1416 @@
 
 
+#if 0 /* -pedantic generates annoying warnings here */
 typedef struct _FTIME
 {
@@ -1422 +1423 @@
   USHORT hours   : 5;
 } FTIME;
+#else
+typedef struct _FTIME
+{
+  unsigned twosecs : 5;
+  unsigned minutes : 6;
+  unsigned hours   : 5;
+} FTIME;
+#endif
 typedef FTIME *PFTIME;
 
+#if 0 /* -pedantic generates annoying warnings here */
 typedef struct _FDATE
 {
@@ -1430 +1440 @@
   USHORT year  : 7;
 } FDATE;
+#else
+typedef struct _FDATE
+{
+  unsigned day   : 5;
+  unsigned month : 4;
+  unsigned year  : 7;
+} FDATE;
+#endif
 typedef FDATE *PFDATE;
 
@@ -8068 +8086 @@
 #define MLE_RGB                         1
 
+#define MLE_INDEX                       0
+#define MLE_RGB                         1
+
 #define MLS_WORDWRAP                    0x0001
 #define MLS_BORDER                      0x0002
@@ -13315 +13336 @@
 
 
+#ifdef INCL_EXAPIS
+
+/** Allocate memory at given location. */
+#define OBJ_LOCATION    0x01000000
+/** The allocated memory object should be duplicated/opened in forked process. */
+#define OBJ_FORK        0x02000000
+
+/**
+ * Extended DosAllocMem().
+ *
+ * @returns See DosAllocMem().
+ * @param   ppv     Where to store the address of the allocated memory.
+ *                  If OBJ_LOCATION is specified in the flFlags *ppv will be the
+ *                  address the object must be allocated at.
+ * @param   cb      Number of bytes to allocate.
+ * @param   flFlags Allocation flags. This API supports the same flags as DosAllocMem()
+ *                  but adds OBJ_FORK and OBJ_LOCATION.
+ *                  If OBJ_FORK is specified the object will be automatically
+ *                  duplicated in the new process.
+ *                  If OBJ_LOCATION is specified the object will be allocated
+ *                  at the address specified by *ppv.
+ * @remark  The memory must be freed with DosFreeMemEx()!
+ */
+APIRET APIENTRY DosAllocMemEx(PPVOID ppv, ULONG cb, ULONG flFlags);
+
+/**
+ * Extended DosAllocSharedMem().
+ *
+ * @returns See DosAllocSharedMem().
+ * @param   ppv     Where to store the address of the allocated memory.
+ * @param   pszName Name of the shared memory. (optional)
+ * @param   cb      Number of bytes to allocate.
+ * @param   flFlags Allocation flags. This API supports the same flags as DosAllocSharedMem()
+ *                  but adds OBJ_FORK.
+ *                  If OBJ_FORK is specified the object will be automatically
+ *                  be opened in a forked() process.
+ * @remark  The memory must be freed with DosFreeMemEx()!
+ */
+APIRET APIENTRY DosAllocSharedMemEx(PPVOID ppv, PCSZ pszName, ULONG cb, ULONG flFlags);
+
+/**
+ * Extended DosGetSharedMem().
+ *
+ * @returns See DosGetSharedMem().
+ * @param   pv      The address of the shared memory.
+ * @param   flFlags Allocation flags. This API supports the same flags as DosGetSharedMem()
+ *                  but adds OBJ_FORK. If OBJ_FORK is specified the object will
+ *                  be automatically be opened in a forked() process.
+ * @remark  The memory must be freed with DosFreeMemEx()!
+ */
+APIRET APIENTRY DosGetSharedMemEx(PVOID pv, ULONG flFlags);
+
+/**
+ * Extended DosGetNamedSharedMem().
+ *
+ * @returns See DosGetNamedSharedMem().
+ * @param   pv      The address of the shared memory.
+ * @param   flFlags Allocation flags. This API supports the same flags as DosGetNamedSharedMem()
+ *                  but adds OBJ_FORK. If OBJ_FORK is specified the object will
+ *                  be automatically be opened in a forked() process.
+ * @remark  The memory must be freed with DosFreeMemEx()!
+ */
+APIRET APIENTRY DosGetNamedSharedMemEx(PPVOID ppv, PCSZ pszName, ULONG flFlags);
+
+/**
+ * Free memory allocated by DosAllocMemEx.
+ *
+ * @returns See DosFreeMem().
+ * @param   pv  Address of the memory to free.
+ */
+APIRET APIENTRY DosFreeMemEx(PVOID pv);
+
+/**
+ * Extended DosCreateEventSem() which will make sure the created semaphore is
+ * opened in a forked process with the same handle.
+ */
+APIRET APIENTRY DosCreateEventSemEx(PSZ pszName, PHEV phev, ULONG flAttr, BOOL32 fState);
+/**
+ * Extended DosCreateMutexSem() which will make sure the created semaphore is
+ * opened in a forked process with the same handle.
+ */
+APIRET APIENTRY DosCreateMutexSemEx(PSZ pszName, PHMTX phmtx, ULONG flAttr, BOOL32 fState);
+/**
+ * Extended DosOpenEventSem() which will make sure the opened semaphore is
+ * opened in a forked process with the same handle.
+ */
+APIRET APIENTRY DosOpenEventSemEx(PSZ pszName, PHEV phev);
+/**
+ * Extended DosOpenMutexSem() which will make sure the opened semaphore is
+ * opened in a forked process with the same handle.
+ */
+APIRET APIENTRY DosOpenMutexSemEx(PSZ pszName, PHMTX phmtx);
+/**
+ * Close semaphore opened or created using the extended APIs.
+ * @returns see DosCloseMutexSem().
+ * @param   hmtx    Handle to the mutex semaphore which is to be closed.
+ */
+APIRET APIENTRY DosCloseMutexSemEx(HMTX hmtx);
+/**
+ * Close semaphore opened or created using the extended APIs.
+ * @returns see DosCloseEventSem().
+ * @param   hev     Handle to the event semaphore which is to be closed.
+ */
+APIRET APIENTRY DosCloseEventSemEx(HEV hev);
+
+#ifdef INCL_EXAPIS_MAPPINGS
+
+#define DosAllocMem(a, b, c)       DosAllocMemEx((a),(b),(c) | OBJ_FORK)
+#define DosAllocSharedMem(a,b,c,d) DosAllocSharedMemEx((a),(b),(c),(d) | OBJ_FORK)
+#define DosFreeMem(a)              DosFreeMemEx((a))
+
+#define DosCreateMutexSem(a,b,c,d) DosCreateMutexSemEx((a),(b),(c),(d))
+#define DosCreateEventSem(a,b,c,d) DosCreateEventSemEx((a),(b),(c),(d))
+#define DosOpenMutexSem(a,b)       DosOpenMutexSemEx((a),(b))
+#define DosOpenEventSem(a,b)       DosOpenEventSemEx((a),(b))
+#define DosCloseMutexSem(a)        DosCloseMutexSemEx((a))
+#define DosCloseEventSem(a)        DosCloseEventSemEx((a))
+
+#endif /* INCL_EXAPIS_MAPPINGS */
+
+
+#endif /* INCL_EXAPIS */
+
+
 /* ------------------------------ THE END --------------------------------- */