Changeset 4164 for trunk/src/win32k/include/OS2KSEM.h

Timestamp:

Sep 2, 2000, 11:08:23 PM (25 years ago)

Author:

bird

Message:

Merged in the Grace branch. New Win32k!

File:

• trunk/src/win32k/include/OS2KSEM.h (modified) (6 diffs)

trunk/src/win32k/include/OS2KSEM.h

@@ -1 @@
-/* $Id: OS2KSEM.h,v 1.1 2000-07-16 22:21:19 bird Exp $
+/* $Id: OS2KSEM.h,v 1.2 2000-09-02 21:07:59 bird Exp $
  *
  * OS/2 kernel Semaphore functions.
@@ -16 +16 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define KSEM_INDEFINITE_WAIT     -1L
-#define KSEM_IMMEDIATE_RETURN     0L
+#define KSEM_INDEFINITE_WAIT       -1UL
+#define KSEM_IMMEDIATE_RETURN       0UL
+
+/*
+ * Semaphore type. ( Used with the generic KSEM routines. )
+ */
+#define KSEM_EVENT                  0
+#define KSEM_MUTEX                  1
+#define KSEM_SHARED                 2
+
+/*
+ * Sempahore flags. (according to SG24-4640-00)
+ */
+#define KSEM_DEFAULT                0
+#define KSEM_NOINTERRUPT            1
+#define KSEM_WRITE                  2
+#define KSEM_DISPLAYID              4
+#define KSEM_NOBLOCKED              8
 
 
@@ -23 +39 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-typedef ULONG  HKSEM;                   /* Handle to kernel semaphore. */
-typedef HKSEM  PHKSEM;                  /* Pointer to kernel semaphore handle. */
-typedef HKSEM  HKMTX;                   /* Handle to kernel mutex semaphore. */
-typedef HKSEM  HKEV;                    /* Handle to kernel event semaphore. */
+/* (This is according to SG24-4640-00.) */
+
+typedef struct _KSEMSHR
+{
+    /**
+     * Astrict 16 is byte while retail 12 is bytes.
+     * We'll reserve 20 bytes just to be sure!.
+     */
+    char achDummy[20];
+
+    struct
+    {
+        char            ks_achSignature[4];
+        char            ks_bFlags;
+        char            ks_bType;
+        unsigned short  ks_Owner;
+        unsigned short  ks_cusPendingWriters;
+        unsigned short  ks_cusNest;
+        unsigned short  ks_cusReaders;
+        unsigned short  ks_cusPendingReaders;
+    } debug;
+
+    struct
+    {
+        char            ks_bFlags;
+        char            ks_bType;
+        unsigned short  ks_Owner;
+        unsigned short  ks_cusPendingWriters;
+        unsigned short  ks_cusNest;
+        unsigned short  ks_cusReaders;
+        unsigned short  ks_cusPendingReaders;
+    } release;
+
+}   KSEMSHR,
+   *PKSEMSHR,
+   *HKSEMSHR;                           /* Handle to kernel shared semphore. */
+typedef HKSEMSHR * PHKSEMSHR;
+
+
+typedef union _KSEMMTX
+{
+    /**
+     * Astrict is 12 byte while retail is 8 bytes.
+     * We'll reserve 20 bytes just to be sure!
+     */
+    char achDummy[20];
+
+    struct
+    {
+        char            ksem_achSignature[4];
+        char            ksem_bFlags;
+        char            ksem_bType;
+        unsigned short  ksem_Owner;
+        unsigned short  ksem_cusPendingWriters;
+        unsigned short  ksem_cusNest;
+    }debug;
+    struct
+    {
+        char            ksem_bFlags;
+        char            ksem_bType;
+        unsigned short  ksem_Owner;
+        unsigned short  ksem_cusPendingWriters;
+        unsigned short  ksem_cusNest;
+    } release;
+}   KSEMMTX,
+   *PKSEMMTX,
+   *HKSEMMTX;                           /* Handle to kernel mutex semaphore. */
+typedef HKSEMMTX * PHKSEMMTX;
+
+
+typedef struct _KSEMEVT
+{
+    /**
+     * Astrict is 16 byte while retail is 12 bytes.
+     * We'll reserve 20 bytes just to be sure!
+     */
+    char achDummy[20];
+
+    struct
+    {
+        char            kse_achSignature[4];
+        char            kse_bFlags;
+        char            kse_bType;
+        unsigned short  kse_Owner;
+        unsigned short  kse_cusPendingWriters;
+    } debug;
+
+    struct
+    {
+        char            kse_bFlags;
+        char            kse_bType;
+        unsigned short  kse_Owner;
+        unsigned short  kse_cusPendingWriters;
+    } release;
+
+}   KSEMEVT,
+   *PKSEMEVT,
+   *HKSEMEVT;                           /* Handle to kernel event sempahore. */
+typedef HKSEMEVT * PHKSEMEVT;
+
+
+typedef union _KSEM
+{
+    KSEMSHR shr;
+    KSEMMTX mtx;
+    KSEMEVT evt;
+} KSEM, *PKSEM, *HKSEM;                 /* Generic kernel semaphore handle. */
+typedef HKSEM * PHKSEM;
 
 
@@ -34 +154 @@
 /*
  * Mutex semaphores.
- * NOTE! Only is KSEMRequestMutex currently is imported!
  */
-extern ULONG KRNLCALL KSEMRequestMutex(HKMTX hkmtx, ULONG ulTimeout);
-extern VOID  KRNLCALL KSEMReleaseMutex(HKMTX hkmtx);
-extern ULONG KRNLCALL KSEMQueryMutex(HKMTX hkmtx, PUSHORT pus);
+extern ULONG KRNLCALL KSEMRequestMutex(HKSEMMTX hkmtx, ULONG ulTimeout);
+extern VOID  KRNLCALL KSEMReleaseMutex(HKSEMMTX hkmtx);
+extern ULONG KRNLCALL KSEMQueryMutex(HKSEMMTX hkmtx, PUSHORT pcusNest);
 
 
@@ -48 +167 @@
 extern VOID  KRNLCALL KSEMPostEvent(HKEV hkevent);
 extern ULONG KRNLCALL KSEMWaitEvent(HKEV hkevent);
+#endif
 
 /*
  * Some other KSEM prefixed functions - parameters's not that obvious...
  */
+#if 0
 extern ULONG KRNLCALL KSEMAlloc(PHKSEM phksem, ULONG p1, ULONG p2);
 extern ULONG KRNLCALL KSEMCreate(PHKSEM phksem, ULONG type);
@@ -57 +178 @@
 extern ULONG KRNLCALL KSEMRequestShared(HKSEM hksem, ULONG);
 extern VOID  KRNLCALL KSEMDestroy(HKSEM hksem);
-extern VOID  KRNLCALL KSEMInit(HKSEM hksem, ULONG p1, ULONG p2);
+#endif
+extern VOID  KRNLCALL KSEMInit(PKSEM pksem, ULONG fulType, ULONG fulFlags);
+#if 0
 extern VOID  KRNLCALL KSEMQuery(HKSEM hksem, ULONG p2)
 extern VOID  KRNLCALL KSEMRelease(HKSEM hksem);