Changeset 2799 for trunk/src

Timestamp:

Feb 16, 2000, 12:39:20 AM (26 years ago)

Author:

bird

Message:

IOCtl exported services.
k32AllocMemEx.

Location:

trunk/src/win32k

Files:

• Makefile (modified) (4 diffs)
• dev16/d16strat.c (modified) (6 diffs)
• dev32/d32ElfIOCtl.c (added)
• dev32/d32Win32kIOCtl.c (added)
• dev32/devfirst.asm (modified) (5 diffs)
• include/OS2KVM.h (modified) (2 diffs)
• include/OS2Krnl.h (modified) (4 diffs)
• include/dev16.h (modified) (2 diffs)
• include/dev1632.h (modified) (3 diffs)
• include/dev32.h (modified) (3 diffs)
• include/k32.h (modified) (2 diffs)
• include/win32k.h (modified) (4 diffs)
• ldr/myVMAllocMem.cpp (added)

trunk/src/win32k/Makefile

@@ -1 +1 @@
 ################################################################################
-# $Id: Makefile,v 1.22 2000-02-10 01:21:34 bird Exp $
+# $Id: Makefile,v 1.23 2000-02-15 23:39:18 bird Exp $
 #
 # Copyright 1998-1999 knut st. osmundsen
@@ -106 +106 @@
     @$(CC) -c $(CFLAGS) $(CDEFINES) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES) $<
 {dev32}.cpp{object}.obj:
+    @$(ECHO) compiling 32bit: $<
+    @$(CC) -c $(CPPFLAGS) $(CDEFINES) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES) $<
+
+{k32}.asm{object}.obj:
+    @$(ECHO) assembling:      $<
+    @$(AS) $(ASFLAGS) $(ADEFINES) $(AINCLUDES) $< -Fo:$@ -Fl:$(WIN32KLIST)\$(*B).lst
+{k32}.c{object}.obj:
+    @$(ECHO) compiling 32bit: $<
+    @$(CC) -c $(CFLAGS) $(CDEFINES) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES) $<
+{k32}.cpp{object}.obj:
     @$(ECHO) compiling 32bit: $<
     @$(CC) -c $(CPPFLAGS) $(CDEFINES) -Fa$(WIN32KLIST)\$(*B).s -Fo$@ $(CINCLUDES) $<
@@ -171 +181 @@
         object\myldrEnum32bitRelRecs.obj \
         object\pe2lx.obj \
-        object\ModuleBase.obj
+        object\ModuleBase.obj \
+        object\d32ElfIOCtl.obj \
+        object\d32Win32kIOCtl.obj \
+        object\k32AllocMemEx.obj
 
 
@@ -276 +289 @@
 ################################################################################
 dep:
-    $(PDWIN32_TOOLS)\fastdep -oObject $(CINCLUDES) misc\*.c* ldr\*.c* dev32\*.c* dev16\*.c* pe2lx\*.c* include\*.h
+    $(PDWIN32_TOOLS)\fastdep -oObject $(CINCLUDES) misc\*.c* ldr\*.c* dev32\*.c* \
+        dev16\*.c* pe2lx\*.c* k32\*.c* lib\*.c include\*.h
 
 object\asmutils.obj:            misc\asmutils.asm     include\devsegdf.inc

trunk/src/win32k/dev16/d16strat.c

@@ -1 @@
-/* $Id: d16strat.c,v 1.3 1999-11-10 01:45:30 bird Exp $
+/* $Id: d16strat.c,v 1.4 2000-02-15 23:39:18 bird Exp $
  *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
@@ -30 +30 @@
 #include "dev1632.h"
 #include "dev16.h"
+#include "win32k.h"
 
 
@@ -88 +89 @@
 USHORT NEAR strategy(PRPH pRpH, unsigned short usDev)
 {
-
     switch (pRpH->Cmd)
     {
@@ -145 +145 @@
             {
                 ULONG ulLin;
-                if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket), &ulLin) != NO_ERROR)
+                if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket),
+                                      &ulLin) != NO_ERROR)
                     return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
                 return CallGetOTEs32(ulLin);
@@ -156 +157 @@
         }
     }
+    else if (pRp->Category == IOCTL_W32K_K32 || pRp->Category == IOCTL_W32K_ELF)
+    {
+        RP32GENIOCTL rp32Init = {0};
+        rp32Init.rph.Len = pRp->rph.Len;
+        rp32Init.rph.Unit = pRp->rph.Unit;
+        rp32Init.rph.Cmd = pRp->rph.Cmd;
+        rp32Init.rph.Status = pRp->rph.Status;
+        rp32Init.rph.Flags = pRp->rph.Flags;
+        rp32Init.rph.Link = (ULONG)pRp->rph.Link;
+        rp32Init.Category = pRp->Category;
+        rp32Init.Function = pRp->Function;
+        rp32Init.sfn = pRp->sfn;
+        rp32Init.DataLen = pRp->DataLen;
+        rp32Init.ParmLen = pRp->ParmLen;
+
+        if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket),
+                              (PLIN)&rp32Init.DataPacket) != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+        if (DevHelp_VirtToLin(SELECTOROF(pRp->ParmPacket), OFFSETOF(pRp->ParmPacket),
+                              (PLIN)&rp32Init.ParmPacket) != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+
+        if (pRp->Category == IOCTL_W32K_ELF)
+            rc = CallElfIOCtl(SSToDS_16a(&rp32Init));
+        else
+            rc = CallWin32kIOCtl(SSToDS_16a(&rp32Init));
+
+        return rc;
+    }
+
 
     return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
@@ -169 +200 @@
 USHORT dev1GenIOCtl(PRP_GENIOCTL pRp)
 {
-    pRp = pRp;
+    if (pRp->Category == IOCTL_W32K_K32 || pRp->Category == IOCTL_W32K_ELF)
+    {
+        USHORT          rc;
+        RP32GENIOCTL    rp32Init = {0};
+        rp32Init.rph.Len = pRp->rph.Len;
+        rp32Init.rph.Unit = pRp->rph.Unit;
+        rp32Init.rph.Cmd = pRp->rph.Cmd;
+        rp32Init.rph.Status = pRp->rph.Status;
+        rp32Init.rph.Flags = pRp->rph.Flags;
+        rp32Init.rph.Link = (ULONG)pRp->rph.Link;
+        rp32Init.Category = pRp->Category;
+        rp32Init.Function = pRp->Function;
+        rp32Init.sfn = pRp->sfn;
+        rp32Init.DataLen = pRp->DataLen;
+        rp32Init.ParmLen = pRp->ParmLen;
+
+        if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket),
+                              (PLIN)&rp32Init.DataPacket) != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+        if (DevHelp_VirtToLin(SELECTOROF(pRp->ParmPacket), OFFSETOF(pRp->ParmPacket),
+                              (PLIN)&rp32Init.ParmPacket) != NO_ERROR)
+            return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+
+        if (pRp->Category == IOCTL_W32K_ELF)
+            rc = CallElfIOCtl(SSToDS_16a(&rp32Init));
+        else
+            rc = CallWin32kIOCtl(SSToDS_16a(&rp32Init));
+
+        return rc;
+    }
+
     return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
 }

trunk/src/win32k/dev32/devfirst.asm

@@ -1 @@
-; $Id: devfirst.asm,v 1.2 1999-10-27 02:02:54 bird Exp $
+; $Id: devfirst.asm,v 1.3 2000-02-15 23:39:19 bird Exp $
 ;
 ; DevFirst - entrypoint and segment definitions
@@ -32 +32 @@
     public _strategyAsm1
     public _CallGetOTEs32
+    public _CallElfIOCtl
+    public _CallWin32kIOCtl
     public _SSToDS_16a
     public GetOS2KrnlMTE
@@ -41 +43 @@
     extrn _TKSSBase16:dword
     extrn GETOTES32:FAR
+    extrn ELFIOCTL:FAR
+    extrn WIN32KIOCTL:FAR
     .286p
     extrn _strategy:near
@@ -84 +88 @@
 ; @cproto    USHORT NEAR CallGetOTEs32(ULONG addressOTEBuf);
 ; @returns   Same as GetOTEs32.
-; @param     addressOTEBuf  32-bit pointer to request data.
+; @param     address of OTEBuf  32-bit pointer to request data.
 ; @status    completely implemented.
 ; @author    knut st. osmundsen
@@ -96 +100 @@
     retn
 _CallGetOTEs32 ENDP
+
+
+
+
+;;
+; Thunk procedure for .
+; @cproto    USHORT NEAR CallElfIOCtl(void);
+; @returns   Same as ElfIOCtl
+; @param     address of IOCtl request packet (32-bit pointer).
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallElfIOCtl PROC NEAR
+    ASSUME CS:CODE16
+    push    ds
+    push    word ptr [esp+6]            ; push high word.
+    push    word ptr [esp+6]            ; push low word.
+    call    far ptr FLAT:ELFIOCTL
+    pop     ds
+    retn
+_CallElfIOCtl ENDP
+
+;;
+; Thunk procedure for .
+; @cproto    USHORT NEAR CallWin32kIOCtl(void);
+; @returns   Same as Win32kIOCtl
+; @param     address of IOCtl request packet (32-bit pointer).
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallWin32kIOCtl PROC NEAR
+    ASSUME CS:CODE16
+    push    ds
+    push    word ptr [esp+6]            ; push high word.
+    push    word ptr [esp+6]            ; push low word.
+    call    far ptr FLAT:WIN32KIOCTL
+    pop     ds
+    retn
+_CallWin32kIOCtl ENDP
+
 
 

trunk/src/win32k/include/OS2KVM.h

@@ -1 @@
-/* $Id: OS2KVM.h,v 1.1 2000-02-15 16:26:06 bird Exp $
+/* $Id: OS2KVM.h,v 1.2 2000-02-15 23:39:19 bird Exp $
  *
  * OS/2 kernel VM functions.
@@ -63 +63 @@
     ULONG   cbSize,
     ULONG   SomeArg1,
-    ULONG   flFlags1
-    USHORT  hPTDA
-    USHORT  usVMOwnerId
-    USHORT  hMTE
-    ULONG   flFlags2
+    ULONG   flFlags1,
+    USHORT  hPTDA,
+    USHORT  usVMOwnerId,
+    USHORT  hMTE,
+    ULONG   flFlags2,
     ULONG   SomeArg2,
     PVMAC   pvmac);

trunk/src/win32k/include/OS2Krnl.h

@@ -1 @@
-/* $Id: OS2Krnl.h,v 1.6 2000-02-03 21:22:30 bird Exp $
+/* $Id: OS2Krnl.h,v 1.7 2000-02-15 23:39:19 bird Exp $
  *
  * OS/2 kernel structures, typedefs and macros.
+ *
+ * Top-level include file.
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -149 +151 @@
    USHORT         mte_usecnt;    /* (.EXE only) - use count */
    CHAR           mte_modname[8];
-}MTE,*PMTE,**PPMTE;
+} MTE,*PMTE,**PPMTE;
 
 
@@ -232 +234 @@
 #ifdef INCL_OS2KRNL_ALL
     #define INCL_OS2KRNL_IO
+    #define INCL_OS2KRNL_VM
 #endif
 
@@ -238 +241 @@
 #endif
 
-#endif
+#ifdef INCL_OS2KRNL_VM
+    #include <OS2KVM.h>
+#endif
+
+#endif

trunk/src/win32k/include/dev16.h

@@ -1 @@
-/* $Id: dev16.h,v 1.3 1999-11-10 01:45:32 bird Exp $
+/* $Id: dev16.h,v 1.4 2000-02-15 23:39:19 bird Exp $
  * dev16 - 16-bit specific. Should not be used in 32-bit C/C++.
  *
@@ -113 +113 @@
 USHORT NEAR CallGetOTEs32(ULONG addressOTEBuf);
 USHORT NEAR CallVerifyProcTab32(void);
+USHORT NEAR CallElfIOCtl(LIN pRpIOCtl);
+USHORT NEAR CallWin32kIOCtl(LIN pRpIOCtl);
+
 
 /*

trunk/src/win32k/include/dev1632.h

@@ -1 @@
-/* $Id: dev1632.h,v 1.1 1999-09-06 02:19:57 bird Exp $
+/* $Id: dev1632.h,v 1.2 2000-02-15 23:39:19 bird Exp $
  * dev1632.h - Common header file for 16-bit and 32-bit C
  *
@@ -31 +31 @@
 } RP32INIT;
 
+typedef struct _RP32GENIOCTL
+{
+    RPH32       rph;
+    UCHAR       Category;
+    UCHAR       Function;
+    PVOID       ParmPacket;
+    PVOID       DataPacket;
+    USHORT      sfn;
+    USHORT      ParmLen;
+    USHORT      DataLen;
+} RP32GENIOCTL, *PRP32GENIOCTL;
+
+
 #ifdef _OS2Krnl_h_
 
@@ -39 +52 @@
     OTE             aObjects[MAXKRNLOBJECTS];
 } KRNLOBJTABLE, FAR * PKRNLOBJTABLE;
+
+#else
+
+#define PKRNLOBJTABLE void *
+
 #endif
 

trunk/src/win32k/include/dev32.h

@@ -1 @@
-/* $Id: dev32.h,v 1.4 1999-11-10 01:45:32 bird Exp $
+/* $Id: dev32.h,v 1.5 2000-02-15 23:39:19 bird Exp $
  *
  * dev32 - header file for 32-bit part of the driver.
@@ -19 +19 @@
  */
 #ifndef _dev1632_h_
-    #define RP32INIT void
-    #define PKRNLOBJTABLE void *
+    #define RP32INIT        void
+    #define PRP32INIT       void *
+    #define RP32GENIOCTL    void
+    #define PRP32GENIOCTL   void *
+    #define PKRNLOBJTABLE   void *
 #endif
+
 
 /*
@@ -54 +58 @@
 USHORT _loadds _Far32 _Pascal GetOTEs32(PKRNLOBJTABLE pOTEBuf);
 USHORT _loadds _Far32 _Pascal VerifyProcTab32(void);
+USHORT _loadds _Far32 _Pascal ElfIOCtl(PRP32GENIOCTL pRpIOCtl);
+USHORT _loadds _Far32 _Pascal Win32kIOCtl(PRP32GENIOCTL pRpIOCtl);
 #endif
 #ifdef _OS2Krnl_h_

trunk/src/win32k/include/k32.h

@@ -1 @@
-/* $Id: k32.h,v 1.1 2000-02-15 16:26:05 bird Exp $
+/* $Id: k32.h,v 1.2 2000-02-15 23:39:19 bird Exp $
  *
  * k32 - definitions.
@@ -12 +12 @@
 #define _k32_h_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*******************************************************************************
 *   Exported Functions                                                         *
 *******************************************************************************/
-APIRET k32AllocMemEx(PPVOID ppb, ULONG cb, ULONG flag);
+APIRET k32AllocMemEx(PPVOID ppb, ULONG cb, ULONG flag, ULONG ulCS, ULONG ulEIP);
 
 
+#ifdef __cplusplus
+}
 #endif
+#endif

trunk/src/win32k/include/win32k.h

@@ -1 @@
-/* $Id: win32k.h,v 1.1 2000-02-15 16:26:06 bird Exp $
+/* $Id: win32k.h,v 1.2 2000-02-15 23:39:19 bird Exp $
  *
  * Top level make file for the Win32k library.
@@ -24 +24 @@
  * K32 category - these are the functions found in the k32 directory.
  */
-#define K32_DOSALLOCMEMEX       0x01
+#define K32_ALLOCMEMEX          0x01
 
 
@@ -33 +33 @@
 
 
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/*
+ * K32 category parameter structs
+ */
+typedef struct _k32AllocMemEx
+{
+    PVOID   pv;                         /* Pointer to allocated memory block */
+                                        /* On input this holds the suggested */
+                                        /* location of the block. */
+    ULONG   cb;                         /* Blocksize (bytes) */
+    ULONG   flFlags;                    /* Flags (equal to DosAllocMem flags) */
+    ULONG   ulCS;                       /* Call CS */
+    ULONG   ulEIP;                      /* Call EIP */
+    ULONG   rc;                         /* Return code. */
+} K32ALLOCMEMEX, *PK32ALLOCMEMEX;
+
+
+
 
 #ifdef INCL_WIN32K_LIB
@@ -38 +58 @@
 *   External Functions                                                         *
 *******************************************************************************/
-APIRET APIENTRY  DosAllocMemEx(PPVOID ppb, ULONG cb, ULONG flag);
+APIRET APIENTRY  DosAllocMemEx(PPVOID ppv, ULONG cb, ULONG flag);
 
 #endif