Changeset 4112 for branches

Timestamp:

Aug 29, 2000, 9:47:04 PM (25 years ago)

Author:

bird

Message:

k32/W32k (lib) IOCtl APIs refshed up and extended.

Location:

branches

Files:

• GRACE/src/win32k/Makefile (modified) (6 diffs)
• GRACE/src/win32k/dev32/d32Win32kIOCtl.c (modified) (4 diffs)
• GRACE/src/win32k/include/OS2KTK.h (modified) (2 diffs)
• GRACE/src/win32k/include/k32.h (modified) (2 diffs)
• GRACE/src/win32k/k32/k32AllocMemEx.cpp (modified) (5 diffs)
• GRACE/src/win32k/lib/libDosAllocMemEx.c (modified) (2 diffs)
• GRACE/src/win32k/lib/libTest.c (modified) (2 diffs)
• Grace/src/win32k/dev16/d16strat.c (modified) (2 diffs)
• Grace/src/win32k/include/win32k.h (modified) (5 diffs)
• Grace/src/win32k/k32 (added)
• Grace/src/win32k/k32/k32QueryOTEs.cpp (added)
• Grace/src/win32k/lib/libW32kQueryOTEs.c (added)
• Grace/src/win32k/lib/libWin32kInstalled.c (added)
• Grace/src/win32k/lib/makefile (modified) (3 diffs)

branches/GRACE/src/win32k/Makefile

@@ -1 +1 @@
 ################################################################################
-# $Id: Makefile,v 1.43.4.6 2000-08-23 04:25:39 bird Exp $
+# $Id: Makefile,v 1.43.4.7 2000-08-29 19:46:59 bird Exp $
 #
 # Win32k makefile.
@@ -343 +343 @@
     $(WIN32KOBJ)\d32Win32kIOCtl.obj \
     $(WIN32KOBJ)\k32AllocMemEx.obj \
+    $(WIN32KOBJ)\k32QueryOTEs.obj \
     $(WIN32KOBJ)\mytkExecPgm.obj\
     $(WIN32KOBJ)\mytkStartProcess.obj
@@ -360 +361 @@
     $(VACPATH)\lib\cppon30.lib  \
 !endif
-    $(DDKPATH)\lib\os2386.lib
+    $(DDKPATH)\lib\os2386.lib \
+    $(WIN32KOBJ)\devhelp.lib
 
 LIBSINIT =\
-    $(WIN32KOBJ)\devhelp.lib \
     $(WIN32KOBJ)\clib.lib
 
@@ -408 +409 @@
     $(WIN32KOBJ)\d32Win32kIOCtl.obj \
     $(WIN32KOBJ)\k32AllocMemEx.obj \
+    $(WIN32KOBJ)\k32QueryOTEs.obj \
     $(WIN32KOBJ)\mytkExecPgm.obj\
     $(WIN32KOBJ)\mytkStartProcess.obj
@@ -482 +484 @@
 $(OBJS:  =^
 )
+/IG
 $(LIBS:  =^
 )
-$(WIN32KOBJ)\anfalmul.obj
 $(WIN32KOBJ)\last.lib
 $(WIN32KOBJ)\init.lib
-/IG $(LIBSINIT)
+$(LIBSINIT)
 $(NAME).def
 <<
@@ -522 +524 @@
 $(WIN32KOBJ)\last.lib
 $(WIN32KOBJ)\tstinit.lib
-/IG $(TSTLIBSINIT)
+$(TSTLIBSINIT)
 $(NAME)tst.def
 <<

branches/GRACE/src/win32k/dev32/d32Win32kIOCtl.c

@@ -1 @@
-/* $Id: d32Win32kIOCtl.c,v 1.1 2000-02-15 23:39:19 bird Exp $
+/* $Id: d32Win32kIOCtl.c,v 1.1.4.1 2000-08-29 19:47:01 bird Exp $
  *
  * Win32k driver IOCtl handler function.
@@ -14 +14 @@
 #define INCL_NOPMAPI
 
+#define NO_WIN32K_LIB_FUNCTIONS
+
 
 /*******************************************************************************
@@ -22 +24 @@
 #include "dev1632.h"
 #include "dev32.h"
+#include "OS2Krnl.h"
 #include "Win32k.h"
 #include "k32.h"
@@ -49 +52 @@
                     return STATUS_DONE;
                 }
+
+                case K32_QUERYOTES:
+                {
+                    PK32QUERYOTES pParm = (PK32QUERYOTES)pRpIOCtl->ParmPacket;
+                    if (pParm == NULL)
+                        return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+                    pParm->rc = k32QueryOTEs((HMTE)pParm->hMTE, pParm->pQOte, pParm->cbQOte);
+                    return STATUS_DONE;
+                }
             }
             break;

branches/GRACE/src/win32k/include/OS2KTK.h

@@ -1 @@
-/* $Id: OS2KTK.h,v 1.1 2000-07-16 22:21:18 bird Exp $
+/* $Id: OS2KTK.h,v 1.1.2.1 2000-08-29 19:47:01 bird Exp $
  *
  * OS2KTK - OS/2 Kernel Task.
@@ -21 +21 @@
 
 #define TKFuChar(pch, pchUsr) \
-            TKFuBuff((PVOID)pch, (PVOID)pchUsr, sizeof(char), TK_FUSU_FATAL);
+            TKFuBuff((PVOID)pch, (PVOID)pchUsr, sizeof(char), TK_FUSU_FATAL)
 #define TKSuChar(pchUsr, pch) \
-            TKSuBuff((PVOID)pchUsr, (PVOID)pch, sizeof(char), TK_FUSU_FATAL);
+            TKSuBuff((PVOID)pchUsr, (PVOID)pch, sizeof(char), TK_FUSU_FATAL)
 
 #define TKFuCharNF(pch, pchUsr) \
-            TKFuBuff((PVOID)pch, (PVOID)pchUsr, sizeof(char), TK_FUSU_NONFATAL);
+            TKFuBuff((PVOID)pch, (PVOID)pchUsr, sizeof(char), TK_FUSU_NONFATAL)
 #define TKSuCharNF(pchUsr, pch) \
-            TKSuBuff((PVOID)pchUsr, (PVOID)pch, sizeof(char), TK_FUSU_NONFATAL);
+            TKSuBuff((PVOID)pchUsr, (PVOID)pch, sizeof(char), TK_FUSU_NONFATAL)
 
 
 #define TKFuUShort(pus, pusUsr) \
-            TKFuBuff((PVOID)pus, (PVOID)pusUsr, sizeof(USHORT), TK_FUSU_FATAL);
+            TKFuBuff((PVOID)pus, (PVOID)pusUsr, sizeof(USHORT), TK_FUSU_FATAL)
 #define TKSuUShort(pusUsr, pus) \
-            TKSuBuff((PVOID)pusUsr, (PVOID)pus, sizeof(USHORT), TK_FUSU_FATAL);
+            TKSuBuff((PVOID)pusUsr, (PVOID)pus, sizeof(USHORT), TK_FUSU_FATAL)
 
 #define TKFuUShortNF(pus, pusUsr) \
-            TKFuBuff((PVOID)pus, (PVOID)pusUsr, sizeof(USHORT), TK_FUSU_NONFATAL);
+            TKFuBuff((PVOID)pus, (PVOID)pusUsr, sizeof(USHORT), TK_FUSU_NONFATAL)
 #define TKSuUShortNF(pusUsr, pus) \
-            TKSuBuff((PVOID)pusUsr, (PVOID)pus, sizeof(USHORT), TK_FUSU_NONFATAL);
+            TKSuBuff((PVOID)pusUsr, (PVOID)pus, sizeof(USHORT), TK_FUSU_NONFATAL)
 
 
 #define TKFuULong(pul, pulUsr) \
-            TKFuBuff((PVOID)pul, (PVOID)pulUsr, sizeof(ULONG), TK_FUSU_FATAL);
+            TKFuBuff((PVOID)pul, (PVOID)pulUsr, sizeof(ULONG), TK_FUSU_FATAL)
 #define TKSuULong(pulUsr, pul) \
-            TKSuBuff((PVOID)pulUsr, (PVOID)pul, sizeof(ULONG), TK_FUSU_FATAL);
+            TKSuBuff((PVOID)pulUsr, (PVOID)pul, sizeof(ULONG), TK_FUSU_FATAL)
 
 #define TKFuULongNF(pul, pulUsr) \
-            TKFuBuff((PVOID)pul, (PVOID)pulUsr, sizeof(ULONG), TK_FUSU_NONFATAL);
+            TKFuBuff((PVOID)pul, (PVOID)pulUsr, sizeof(ULONG), TK_FUSU_NONFATAL)
 #define TKSuULongNF(pulUsr, pul) \
-            TKSuBuff((PVOID)pulUsr, (PVOID)pul, sizeof(ULONG), TK_FUSU_NONFATAL);
+            TKSuBuff((PVOID)pulUsr, (PVOID)pul, sizeof(ULONG), TK_FUSU_NONFATAL)
 
 

branches/GRACE/src/win32k/include/k32.h

@@ -1 @@
-/* $Id: k32.h,v 1.2 2000-02-15 23:39:19 bird Exp $
+/* $Id: k32.h,v 1.2.4.1 2000-08-29 19:47:01 bird Exp $
  *
  * k32 - definitions.
@@ -20 +20 @@
 *******************************************************************************/
 APIRET k32AllocMemEx(PPVOID ppb, ULONG cb, ULONG flag, ULONG ulCS, ULONG ulEIP);
+APIRET k32QueryOTEs(HMTE hMTE, PQOTEBUFFER pQOte, ULONG cbOte);
 
 

branches/GRACE/src/win32k/k32/k32AllocMemEx.cpp

@@ -1 @@
-/* $Id: k32AllocMemEx.cpp,v 1.2 2000-02-18 19:27:30 bird Exp $
+/* $Id: k32AllocMemEx.cpp,v 1.2.4.1 2000-08-29 19:47:02 bird Exp $
  *
  * k32AllocMemEx - Equivalent to DosAllocMem, but this one
@@ -18 +18 @@
 #define INCL_OS2KRNL_VM
 
+#define NO_WIN32K_LIB_FUNCTIONS
+
 #ifndef OBJ_SELMAPALL
 #define OBJ_SELMAPALL   0x00000800UL
@@ -28 +30 @@
 #include <os2.h>
 #include "OS2Krnl.h"
+#include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
 #include "log.h"
+#include "macros.h"
 
 
@@ -95 +99 @@
 APIRET k32AllocMemEx(PPVOID ppv, ULONG cb, ULONG flag, ULONG ulCS, ULONG ulEIP)
 {
+    #if 0
     APIRET  rc;
     ULONG   flFlags2;
@@ -133 +138 @@
 
     return rc;
+    #else
+    NOREF(ppv);
+    NOREF(cb);
+    NOREF(flag);
+    NOREF(ulCS);
+    NOREF(ulEIP);
+    return ERROR_NOT_SUPPORTED;
+    #endif
 }
 

branches/GRACE/src/win32k/lib/libDosAllocMemEx.c

@@ -1 @@
-/* $Id: libDosAllocMemEx.c,v 1.3 2000-02-26 19:59:55 bird Exp $
+/* $Id: libDosAllocMemEx.c,v 1.3.4.1 2000-08-29 19:47:03 bird Exp $
  *
  * DosAllocMemEx - Extened Edition of DosAllocMem.
@@ -17 +17 @@
 #define INCL_DOSFILEMGR
 #define INCL_DOSDEVICES
-#define INCL_WIN32K_LIB
 
 

branches/GRACE/src/win32k/lib/libTest.c

@@ -1 @@
-/* $Id: libTest.c,v 1.1 2000-02-26 20:19:26 bird Exp $
+/* $Id: libTest.c,v 1.1.4.1 2000-08-29 19:47:03 bird Exp $
  *
  * Test program for the win32k library.
@@ -12 +12 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define INCL_WIN32K_LIB
 #define INCL_BASE
 

branches/Grace/src/win32k/dev16/d16strat.c

@@ -1 @@
-/* $Id: d16strat.c,v 1.8 2000-02-25 18:15:02 bird Exp $
+/* $Id: d16strat.c,v 1.8.4.1 2000-08-29 19:47:00 bird Exp $
  *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
@@ -15 +15 @@
 #define INCL_DOSERRORS
 #define INCL_NOPMAPI
+
+#define NO_WIN32K_LIB_FUNCTIONS
 
 /*******************************************************************************

branches/Grace/src/win32k/include/win32k.h

@@ -1 @@
-/* $Id: win32k.h,v 1.4 2000-02-26 20:21:42 bird Exp $
+/* $Id: win32k.h,v 1.4.4.1 2000-08-29 19:47:01 bird Exp $
  *
  * Top level make file for the Win32k library.
@@ -25 +25 @@
  */
 #define K32_ALLOCMEMEX          0x01
-
+#define K32_QUERYOTES           0x02
 
 /*
@@ -36 +36 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
+#pragma pack(1)
+
+/*
+ * Object Table Entry buffer.
+ */
+typedef struct _QueryOTE
+{
+    ULONG   ote_size;                   /* Object virtual size */
+    ULONG   ote_base;                   /* Object base virtual address */
+    ULONG   ote_flags;                  /* Attribute flags */
+    ULONG   ote_pagemap;                /* Object page map index */
+    ULONG   ote_mapsize;                /* Num of entries in obj page map */
+  /*ULONG   ote_reserved;*/
+    USHORT  ote_sel;                    /* Object Selector */
+    USHORT  ote_hob;                    /* Object Handle */
+} QOTE, *PQOTE;
+
+typedef struct _QueryOTEBuffer
+{
+    ULONG   cOTEs;                      /* Number of entries in aOTE. */
+    QOTE    aOTE[1];                    /* Array of OTEs. */
+} QOTEBUFFER, *PQOTEBUFFER;
+
+
 /*
  * K32 category parameter structs
@@ -51 +75 @@
 } K32ALLOCMEMEX, *PK32ALLOCMEMEX;
 
+typedef struct _k32QueryOTEs
+{
+    HMODULE     hMTE;                   /* Module handle. */
+    PQOTEBUFFER pQOte;                  /* Pointer to output buffer. */
+    ULONG       cbQOte;                 /* Size of the buffer pointed to by pQOte  */
+    ULONG       rc;                     /* Return code. */
+} K32QUERYOTES, *PK32QUERYOTES;
 
 
+#pragma pack()
 
-#ifdef INCL_WIN32K_LIB
+#ifndef NO_WIN32K_LIB_FUNCTIONS
 /*******************************************************************************
 *   External Functions                                                         *
@@ -61 +93 @@
 APIRET APIENTRY  libWin32kTerm(void);
 USHORT APIENTRY  libHelperGetCS(void);
+BOOL   APIENTRY  libWin32kInstalled(void);
 APIRET APIENTRY  DosAllocMemEx(PPVOID ppv, ULONG cb, ULONG flag);
+APIRET APIENTRY  W32kQueryOTEs(HMODULE hMTE, PQOTEBUFFER pQOte, ULONG cbQOte);
 
 

branches/Grace/src/win32k/lib/makefile

@@ -1 +1 @@
 ##############################################################################
-# $Id: makefile,v 1.3 2000-03-17 17:38:27 bird Exp $
+# $Id: makefile,v 1.3.4.1 2000-08-29 19:47:04 bird Exp $
 #
 # PD-Win32 API
@@ -49 +49 @@
 OBJS     =  $(WIN32KOBJ)\libInit.$(OBJEXT)         \
             $(WIN32KOBJ)\libTerm.$(OBJEXT)     \
+            $(WIN32KOBJ)\libWin32kInstalled.$(OBJEXT) \
             $(WIN32KOBJ)\libDosAllocMemEx.$(OBJEXT) \
+            $(WIN32KOBJ)\libW32kQueryOTEs.$(OBJEXT) \
             $(WIN32KOBJ)\libGetCS.obj
 
@@ -86 +88 @@
 ##############################################################################
 dep:
-    $(DEPEND) -obj$(OBJEXT) -o$(WIN32KOBJ) $(CINCLUDES) $(WIN32KBASE)\include\*.h
+    $(DEPEND) -obj$(OBJEXT) -o$(WIN32KOBJ) $(CINCLUDES) \
+        $(WIN32KBASE)\include\*.h *.c* *.asm
 
 !if [$(EXISTS) .depend] == 0