Changeset 6841 for branches

branches/splittup/src/win32k/Makefile

-              r6637
+              r6841
 # $Id: Makefile,v 1.71 2001-09-05 09:29:06 bird Exp $
+# $Id: Makefile,v 1.71.2.1 2001-09-27 03:08:07 bird Exp $
+#
 …
+#
 !include makefile.inc
 !if [..\..\tools\bin\Exists.cmd $(WIN32KINCLUDE)\OS2Krnl.h] == 1
+!if [..\..\tools\bin\Exists.cmd $(KKRNLLIBINCLUDE)\OS2Krnl.h] == 1
 !   if [echo Bad makefile.inc - Reconfiguring Win32k... & configure.cmd -noninteractive]
 !   endif
 …
+#
 SUBDIRS = \
+.\kKrnlLib \
 .\lib \
 .\rexx \
 …
 all:
 !if "$(DDKPATH)" == "" || "$(MSCPATH)" == ""  || "$(TOOLKIT)" == "" || "$(VACPATH)" == ""
+    $(DODIRS) "lib" $(MAKE_CMD)
     $(MAKE_CMD) -f xx2lx.mak
-    $(DODIRS) "lib" $(MAKE_CMD)
 !else
+    $(DODIRS) "$(SUBDIRS)" $(MAKE_CMD)
     $(MAKE_CMD) -f win32k.mak
     $(MAKE_CMD) -f xx2lx.mak
-    $(DODIRS) "$(SUBDIRS)" $(MAKE_CMD)
 !endif
 …
 $(WIN32KBIN)\win32ktst.exe win32ktst.exe win32ktst \
-$(WIN32KBIN)\extact.exe    extract.exe   extract \
-$(WIN32KBIN)\mkcalltab.exe mkcalltab.exe mkcalltab \
 $(WIN32KBIN)\libconv.exe   libconv.exe   libconv \
 clfix.exe: .force
 …
     $(MAKE_CMD) -f win32k.mak $(WIN32KINCLUDE)\$(@B).inc
-$(WIN32KBASE)\ldr\calltaba.asm ldr\calltaba.asm: .force
-    $(MAKE_CMD) -f $(WIN32KBASE)\ldr\calltaba.asm
-$(WIN32KBASE)\test\TstFakers.c test\TstFakers.c: .force
-    $(MAKE_CMD) -f $(WIN32KBASE)\test\TstFakers.c
 win32kcc.exe win32kcc:
     $(DODIRS) "utils" $(MAKE_CMD)
 …
+#
 lib:
     $(DODIRS) ".\lib" $(MAKE_CMD) lib
+    $(DODIRS) ".\KrnlLib .\lib" $(MAKE_CMD) lib
 …
         $(ODIN32_BIN)\win32k.ddp
 !if "$(WIN32KBIN)" != ""
     $(RM) $(WIN32KBIN)\*.*
+    $(RM) $(WIN32KBIN)\*
 !endif
 !if "$(WIN32KOBJ)" != ""
+    $(RM) $(WIN32KOBJ)\*obj* \
+        $(WIN32KOBJ)\*lnk* \
+        $(WIN32KOBJ)\*res* \
+        $(WIN32KOBJ)\*lib* \
+        $(WIN32KOBJ)\*def*
+    $(RM) $(WIN32KOBJ)\*
 !endif
 !if "$(WIN32KLIST)" != ""
+    $(RM) $(WIN32KLIST)\*lst* \
+        $(WIN32KLIST)\*.s* \
+        $(WIN32KLIST)\*as*
+    $(RM) $(WIN32KLIST)\*
 !endif
+!if "$(WIN32KBASE)" != ""
+    $(RM) $(WIN32KBASE)\ldr\calltaba.asm $(WIN32KBASE)\test\TstFakers.c
+!if "$(WIN32KINCLUDE)" != ""
+    $(RM) $(WIN32KBIN)\options.inc \
+          $(WIN32KBIN)\api.inc \
+          $(WIN32KBIN)\win32k.inc
 !endif
     $(DODIRS) "$(SUBDIRS)" $(MAKE_CMD) clean
 …
+#
 dep:
+    $(RM) .depend
     $(ODIN32_TOOLS)\fastdep @<<
         -o$$(WIN32KOBJ) $(CINCLUDES) -xldr\calltaba.asm -xtest\TstFakers.c
+        -o$$(WIN32KOBJ) $(CINCLUDES)
         misc\*.c* ldr\*.c* dev32\*.c* pe2lx\*.c* k32\*.c* elf2lx\*.c* test\*.c*
         -objobj_tst
         misc\*.c* ldr\*.c* dev32\*.c* pe2lx\*.c* k32\*.c* elf2lx\*.c* test\*.c*
         $(WIN32KINCLUDE)\*.h
+        $(KKRNLLIBINCLUDE)\*.h
 <<
     $(ODIN32_TOOLS)\fastdep @<<
         -a+ -o$$(WIN32KOBJ) -I$(WIN32KINCLUDE) -I$(DDKPATH)\inc
-        -xldr\calltaba.asm -xtest\TstFakers.c
         dev16\*.asm ldr\*.asm misc\*.asm dev32\*.asm pe2lx\*.asm k32\*.asm elf2lx\*.asm test\*.asm
         $(WIN32KINCLUDE)\*.inc
 …
     ..\..\tools\bin\StateUpd.exe -Dll:Win32k dev16 dev32 misc ldr elf2lx mmf k32
     ..\..\tools\bin\StateUpd.exe -Dll:Pe2Lx Pe2Lx
+#
+# Documentation generation - require SDS - http://www.ii.uib.no/~stig/
+#  (Old SDS 0.33 - don't work anylonger.)
+#
+lxdoc:
+    cpp2sds -o DocsA\ -i include\modulebase.h include\pe2lx.h ldr\modulebase.cpp pe2lx\pe2lx.cpp
+    cd DocsA
+    exp sds2doc -ai *.sds
+fulldoc:
+    exp cpp2sds -o DocsA\ -i include\*.h *.cpp ldr\*.cpp misc\*.cpp pe2lx\*.cpp
+    cd DocsA
+    exp sds2doc -ai *.sds
+    $(DODIRS) ".\kKrnlLib" $(MAKE_CMD) $@
 …
 $(COMMONRULES:clean dep lib all=):

branches/splittup/src/win32k/Xx2Lx.mak

-              r5293
+              r6841
 # $Id: Xx2Lx.mak,v 1.1 2001-03-11 16:37:17 bird Exp $
+# $Id: Xx2Lx.mak,v 1.1.2.1 2001-09-27 03:08:06 bird Exp $
+#
 …
 # Tools and Flags Addjustments
+#
 CINCLUDES   = -I$(WIN32KINCLUDE) $(CINCLUDES)
+CINCLUDES   = -I$(WIN32KINCLUDE) -I$(KKRNLLIBINCLUDE) $(CINCLUDES)
 CDEFINES    = $(CDEFINES) -DRING3 -DXX2LX
 !if "$(VAC3)" == "1" || "$(VAC36)" == "1"

branches/splittup/src/win32k/calltrees.txt

r2933	r6841
	1	OBSOLETE! (Sep 27 2001 2:01am)
	2
1	3	A overview of the win32k device driver.
2	4	----------------------------------------

branches/splittup/src/win32k/configure.cmd

-              r5945
+              r6841
 /* $Id: configure.cmd,v 1.21 2001-06-10 01:43:36 bird Exp $
+/* $Id: configure.cmd,v 1.21.2.1 2001-09-27 03:08:06 bird Exp $
+ *
  * Configuration script.
 …
                 when (ch = '?' | ch = 'H' | substr(sArg, 1, 2) = '-H') then
                 do
                     say 'Odin32 Configure.cmd. $Revision: 1.21 $.'
+                    say 'Odin32 Configure.cmd. $Revision: 1.21.2.1 $.'
                     say 'syntax: Configure.cmd [-n] [-w]'
                     say '  -n   Noninteractive.'
 …
         call lineout sIncFile, 'WIN32KELF2LX     =' sWin32kBase'\elf2lx'
         call lineout sIncFile, 'WIN32KINCLUDE    =' sWin32kBase'\include'
+        call lineout sIncFile, 'KKRNLLIBINCLUDE =' sWin32kBase'\kKrnlLib\include'
         call lineout sIncFile, 'WIN32KK32        =' sWin32kBase'\k32'
         call lineout sIncFile, 'WIN32KLDR        =' sWin32kBase'\ldr'

branches/splittup/src/win32k/dev16/d16globl.c

-              r5000
+              r6841
 /* $Id: d16globl.c,v 1.4 2001-01-21 07:54:37 bird Exp $
+/* $Id: d16globl.c,v 1.4.2.1 2001-09-27 03:08:10 bird Exp $
+ *
  * d16globals - global data (16-bit)
+ *
  * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #include "devSegDf.h"
 #include "options.h"
-#include "log.h"
 …
  *       Uninitialized variables ends up in DATA32. */
 PFN         Device_Help = NULL;
-ULONG       TKSSBase16  = 0;
-USHORT      R0FlatCS16  = 0;
-USHORT      R0FlatDS16  = 0;
 BOOL        fInitTime   = TRUE;
 struct options
+struct Win32kOptions
             DATA16_GLOBAL options = DEFAULT_OPTION_ASSIGMENTS;
 CHAR        szBuildDate[] = {__DATE__};
 CHAR        szBuildTime[] = {__TIME__};
-CHAR        szWin32kIni[160] = {"\win32k.ini"};

branches/splittup/src/win32k/dev16/d16init.c

-              r6431
+              r6841
 /* $Id: d16init.c,v 1.12 2001-07-31 21:36:37 bird Exp $
+/* $Id: d16init.c,v 1.12.2.1 2001-09-27 03:08:10 bird Exp $
+ *
  * d16init - init routines for both drivers.
 …
  *            completed. CodeEnd and DataEnd should not be set here.?
+ *
  * Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #include "devSegDf.h"
 #undef  DATA16_INIT
+/*#undef  DATA16_INIT
 #define DATA16_INIT
 #undef  CODE16_INIT
+#define CODE16_INIT
+#include "probkrnl.h"
+#define CODE16_INIT*/
 #include "dev1632.h"
 #include "dev16.h"
 #include "vprntf16.h"
-#include "log.h"
 #include "options.h"
-#include "errors.h"
+/**
+ * init function - device 0.
+ * Does nothing else than setting the device_help variable and
+ * fill the request packet.
+ * @returns   Status word.
+ * @param     pRpIn   Pointer to input request packet.  Actually the same memory as pRpOut but another struct.
+ * @param     pRpOut  Pointer to output request packet. Actually the same memory as pRpIn  but another struct.
+ * @remark    pRpIn and pRpOut points to the same memory.
+ */
+USHORT NEAR dev0Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
+{
+    APIRET  rc;
+    Device_Help = pRpIn->DevHlpEP;
+    /*
+     * Does this work at Ring-3 (inittime)?
+     * If this work we could be saved from throuble!
+     */
+    rc = initGetDosTableData();
+    if (rc != NO_ERROR)
+        printf16("win32k - elf$: initGetDosTableData failed with rc=%d\n", rc);
+    pRpOut->BPBArray = NULL;
+    pRpOut->CodeEnd = (USHORT)&CODE16_INITSTART;
+    pRpOut->DataEnd = (USHORT)&DATA16_INITSTART;
+    pRpOut->Unit     = 0;
+    pRpOut->rph.Status = STATUS_DONE;
+    return STATUS_DONE;
+}
+#include "kKLInitHlp.h"
 …
  * @remark    pRpIn and pRpOut points to the same memory.
  */
 USHORT NEAR dev1Init(PRPINITIN pRpIn, PRPINITOUT pRpOut)
+USHORT NEAR devInit(PRPINITIN pRpIn, PRPINITOUT pRpOut)
+{
     APIRET          rc;
     D16R0INITPARAM  param;
     D16R0INITDATA   data = {0};
     HFILE           hDev0 = 0;
+    ULONG           rc;
+    KKLR0INITPARAM  param;
+    KKLR0INITDATA   data = {0UL};
+    HFILE           hKrnlLib = 0;
     USHORT          usAction = 0;
     NPSZ            npszErrMsg = NULL;
-    const char *    npszErrMsg2 = NULL;
     /*
+     * Probe kernel data.
+     * Open and send a Ring-0 init packet to kKrnlHlp.
+     * If this succeeds win32k$ init succeeds.
      */
+    rc = ProbeKernel(pRpIn);
+    rc = DosOpen(KKL_DEVICE_NAME, &hKrnlLib, &usAction, 0UL, FILE_NORMAL,
+                 OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                 OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
+UL);
     if (rc == NO_ERROR)
+    {
         /*
+         * Open and send a Ring-0 init packet to elf$.
+         * If this succeeds win32k$ init succeeds.
+         * Create new 32-bit init packet - Parameter pointer is thunked.
          */
+        rc = DosOpen("\\dev\\elf$", &hDev0, &usAction, 0UL, FILE_NORMAL,
+                     OPEN_ACTION_FAIL_IF_NEW | OPEN_ACTION_OPEN_IF_EXISTS,
+                     OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
+UL);
+        if (rc == NO_ERROR)
+        {
+            param.pRpInitIn = pRpIn;
+            rc = DosDevIOCtl(&data, &param, D16_IOCTL_RING0INIT, D16_IOCTL_CAT, hDev0);
+        RP32INIT        rp32init;
+        RP32INIT FAR *  fprp32init = &rp32init;
+        _fmemcpy(fprp32init, pRpIn, sizeof(RPINITIN));
+        if ((   pRpIn->InitArgs == NULL
+             || !(rc = DevHelp_VirtToLin(SELECTOROF(rp32init.InitArgs), OFFSETOF(rp32init.InitArgs), (PLIN)&rp32init.InitArgs))
+             )
+            &&  !(rc = DevHelp_VirtToLin(SELECTOROF(fprp32init), OFFSETOF(fprp32init), (PLIN)&param.ulParam))
+           )
+        {   /* call 32-bit init routine and set 32 bit rc. */
+            param.pfn = GetR0InitPtr();
+            rc = DosDevIOCtl(&data, &param, KKL_IOCTL_RING0INIT, KKL_IOCTL_CAT, hKrnlLib);
             if (rc == NO_ERROR)
+            {
                 if (data.usRcInit32 == NO_ERROR)
+                if (data.ulRc == NO_ERROR)
+                {
                     if (!options.fQuiet)
 …
+                {
                     /* set correct error message and rc */
+                    rc = data.usRcInit32;
+                    npszErrMsg = "Ring-0 initiation failed. rc=%x\n";
+                    if (rc >= ERROR_D32_FIRST && rc <= ERROR_D32_LAST)
+                        npszErrMsg2 =
+                        GetErrorMsg(
+                        data.usRcInit32
+                        + ERROR_PROB_SYM_D32_FIRST
+                        - ERROR_D32_FIRST
+                        );
+                    rc = data.ulRc;
+                    npszErrMsg = "Ring-0 initiation failed. rc=%ld\n";
+                }
+            }
             else
+                npszErrMsg = "Ring-0 init: DosDevIOCtl failed. rc=%d\n";
+            DosClose(hDev0);
+                npszErrMsg = "Ring-0 init: DosDevIOCtl failed. rc=%ld\n";
+        }
         else
+            npszErrMsg = "Ring-0 init: DosOpen failed. rc=%d\n";
+            npszErrMsg = "Ring-0 init: Argument thunking failed. rc=%ld\n";
+        DosClose(hKrnlLib);
+    }
     else
+        npszErrMsg = ""; /* ProbeKrnl do its own complaining, but we need something here to indicate failure. */
+        npszErrMsg = "Ring-0 init: DosOpen failed. rc=%ld\n";
     /*
 …
+    {
         printf16(npszErrMsg, rc);
-        if (npszErrMsg2)
-            printf16("%s\n", npszErrMsg2);
         pRpOut->Status = pRpOut->rph.Status = STATUS_DONE | STERR | ERROR_I24_GEN_FAILURE;
+    }
 …
+}
-/**
- * R0 16-bit initiation.
- * This gets TKSSBase, thunks parameters and calls R0 32-bit initiation function.
- * @returns     Status word. We don't fail on R0Init32 but forwards the result
- *              using the usRcInit32.
- * @param       pRp     Generic IO Control request packet.
- */
-USHORT NEAR  R0Init16(PRP_GENIOCTL pRp)
+{
-    USHORT usRc = STATUS_DONE;
-    APIRET rc;
-    /* First we're to get the DosTable2 stuff. */
-    rc = initGetDosTableData();
-    if (rc == NO_ERROR)
+    {
-        ULONG cPages;
-        char  hLockParm[12] = {0};
-        ULONG ulLinParm;
-        char  hLockData[12] = {0};
-        ULONG ulLinData;
-        /*
-         * Thunk the request packet and lock userdata.
-         */
-        if (!DevHelp_VirtToLin(SELECTOROF(pRp->ParmPacket), OFFSETOF(pRp->ParmPacket), &ulLinParm)
-            &&
-            !DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket), &ulLinData)
+            )
+        {
-            if (!(rc = DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE,
-                                ulLinParm, sizeof(D16R0INITPARAM),
-                                (LIN)~0UL, SSToDS_16(&hLockParm[0]), &cPages))
-                &&
-                !DevHelp_VMLock(VMDHL_LONG | VMDHL_WRITE,
-                                ulLinData, sizeof(D16R0INITDATA),
-                                (LIN)~0UL, SSToDS_16(&hLockData[0]), &cPages)
+                )
+            {
-                /*
-                 * -data and param is locked (do we need to lock the request packet too ?).-
-                 * Create new 32-bit init packet - Parameter pointer is thunked.
-                 */
-                RP32INIT rp32init;
-                _fmemcpy(&rp32init, ((PD16R0INITPARAM)pRp->ParmPacket)->pRpInitIn, sizeof(RPINITIN));
-                if (((PD16R0INITPARAM)pRp->ParmPacket)->pRpInitIn->InitArgs == NULL ||
-                    !DevHelp_VirtToLin(SELECTOROF(rp32init.InitArgs), OFFSETOF(rp32init.InitArgs), (PLIN)&rp32init.InitArgs)
+                   )
-                {   /* call 32-bit init routine and set 32 bit rc. */
-                    usRc = CallR0Init32(SSToDS_16(&rp32init));
-                    ((PD16R0INITDATA)pRp->DataPacket)->usRcInit32 = usRc;
-                    /* set status to done (success).  (R0Init32 RC is return as usRcInit32.)  */
-                    usRc = STATUS_DONE;
+                }
-                else
-                    usRc |= STERR | ERROR_I24_INVALID_PARAMETER;
-                /*
-                 * finished - unlock data and parm;
-                 */
-                DevHelp_VMUnLock((LIN)SSToDS_16(&hLockParm[0]));
-                DevHelp_VMUnLock((LIN)SSToDS_16(&hLockData[0]));
+            }
-            else
-                usRc |= STERR | ERROR_I24_INVALID_PARAMETER;
+        }
-        else
-            usRc |= STERR | ERROR_I24_INVALID_PARAMETER;
+    }
-    else
-        usRc |= STERR | ERROR_I24_GEN_FAILURE;
-    return usRc;
+}
-/**
- * Gets the data we need from the DosTables.
- * This data is TKSSBase16, R0FlatCS16 and R0FlatDS16.
- * @returns   Same as DevHelp_GetDosVar.
- * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- * @remark    If you are not sure if TKSSBase16 is set or not, call this.
- *            After R0Init16 is called TKSSBase16 _is_ set.
- *            IMPORTANT! This function must _not_ be called after the initiation of the second device driver!!!
- *                       (Since this is init code not present after init...)
- */
-USHORT NEAR  initGetDosTableData(void)
+{
-    APIRET     rc;
-    PDOSTABLE  pDT;
-    PDOSTABLE2 pDT2;
-    if (TKSSBase16 != 0)
-        return NO_ERROR;
-    /*
-    _asm {
-        int 3;
+    }
-    */
-    /* First we're to get the DosTable2 stuff. */
-    rc = DevHelp_GetDOSVar(9, 0, &pDT);
-    if (rc == NO_ERROR)
+    {
-        pDT2 = (PDOSTABLE2)((char FAR *)pDT + pDT->cul*4 + 1);
-        TKSSBase16 = (ULONG)pDT2->pTKSSBase;
-        R0FlatCS16 = (USHORT)pDT2->R0FlatCS;
-        R0FlatDS16 = (USHORT)pDT2->R0FlatDS;
+    }
-    return rc;
+}

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

-              r6220
+              r6841
 /* $Id: d16strat.c,v 1.12 2001-07-08 02:57:42 bird Exp $
+/* $Id: d16strat.c,v 1.12.2.1 2001-09-27 03:08:11 bird Exp $
+ *
  * d16strat.c - 16-bit strategy routine, device headers, device_helper (ptr)
 …
 *   Global Variables                                                           *
 *******************************************************************************/
+extern DDHDR _far aDevHdrs[2];
+DDHDR aDevHdrs[2] = /* This is the first piece data in the driver!!!!!!! */
+DDHDR aDevHdrs[1] = /* This is the first piece data in the driver!!!!!!! */
+{
+    {
-        &aDevHdrs[1], /* NextHeader */
-        DEVLEV_3 | DEV_30 | DEV_CHAR_DEV,           /* SDevAtt */
-        (unsigned short)(void _near *)strategyAsm0, /* StrategyEP */
-,                                          /* InterruptEP */
-        "elf$    ",                                 /* DevName */
-,                                          /* SDevProtCS */
-,                                          /* SDevProtDS */
-,                                          /* SDevRealCS */
-,                                          /* SDevRealDS */
-        DEV_16MB | DEV_IOCTL2                       /* SDevCaps */
-    },
+    {
         ~0UL,                                       /* NextHeader */
         DEVLEV_3 | DEV_30 | DEV_CHAR_DEV,           /* SDevAtt */
         (unsigned short)(void _near *)strategyAsm1, /* StrategyEP */
+        (unsigned short)(void _near *)strategyAsm,  /* StrategyEP */
 ,                                          /* InterruptEP */
         "win32k$ ",                                 /* DevName */
 …
 *   Internal Functions                                                         *
 *******************************************************************************/
+USHORT NEAR dev0GenIOCtl(PRP_GENIOCTL pRp);
+USHORT NEAR dev1GenIOCtl(PRP_GENIOCTL pRp);
+USHORT NEAR devGenIOCtl(PRP_GENIOCTL pRp);
 …
  * @returns   Status word.
  * @param     pRpH   Pointer to request packed header. (Do not change the pointer!)
- * @parma     usDev  Device number.
  * @remark    This function is called from the entrypoint in dev1st.asm
  */
 USHORT NEAR strategy(PRPH pRpH, unsigned short usDev)
+USHORT NEAR strategy(PRPH pRpH)
+{
     switch (pRpH->Cmd)
 …
         case CMDInit:                   /* INIT command */
             if (fInitTime)
+            {
+                if (usDev == 0)
+                    return dev0Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
+                return dev1Init((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
+            }
+                return devInit((PRPINITIN)pRpH, (PRPINITOUT)pRpH);
             break;
         case CMDGenIOCTL:               /* Generic IOCTL */
+            if (usDev == 0)
+                return dev0GenIOCtl((PRP_GENIOCTL)pRpH);
+            return dev1GenIOCtl((PRP_GENIOCTL)pRpH);
+            return devGenIOCtl((PRP_GENIOCTL)pRpH);
         case CMDOpen:                   /* device open */
         case CMDClose:                  /* device close */
+            if (usDev == 1)
+            {
+                RP32OPENCLOSE rp32OpenClose = {0};
+                rp32OpenClose.rph.Len = pRpH->Len;
+                rp32OpenClose.rph.Unit = pRpH->Unit;
+                rp32OpenClose.rph.Cmd = pRpH->Cmd;
+                rp32OpenClose.rph.Status = pRpH->Status;
+                rp32OpenClose.rph.Flags = pRpH->Flags;
+                rp32OpenClose.rph.Link = (ULONG)pRpH->Link;
+                rp32OpenClose.sfn = ((PRP_OPENCLOSE)pRpH)->sfn;
+                if (pRpH->Cmd == CMDOpen)
+                    return CallWin32kOpen(SSToDS_16a(&rp32OpenClose));
+                return CallWin32kClose(SSToDS_16a(&rp32OpenClose));
+            }
+            return STATUS_DONE;
+        {
+            RP32OPENCLOSE rp32OpenClose = {0};
+            rp32OpenClose.rph.Len = pRpH->Len;
+            rp32OpenClose.rph.Unit = pRpH->Unit;
+            rp32OpenClose.rph.Cmd = pRpH->Cmd;
+            rp32OpenClose.rph.Status = pRpH->Status;
+            rp32OpenClose.rph.Flags = pRpH->Flags;
+            rp32OpenClose.rph.Link = (ULONG)pRpH->Link;
+            rp32OpenClose.sfn = ((PRP_OPENCLOSE)pRpH)->sfn;
+            if (pRpH->Cmd == CMDOpen)
+                return CallWin32kOpen(SSToDS_16a(&rp32OpenClose));
+            return CallWin32kClose(SSToDS_16a(&rp32OpenClose));
+        }
         case CMDDeInstall:              /* De-Install driver */
 …
 /**
+ * Generic I/O Control - device 0.
+ * This will only handle the request for Ring-0 initiation.
+ * @returns   Status word.
+ * @param     pRp  Request packet.
+ */
+USHORT NEAR dev0GenIOCtl(PRP_GENIOCTL pRp)
+{
+    USHORT rc;
+    if (pRp->Category == D16_IOCTL_CAT)
+    {
+        switch (pRp->Function)
+        {
+            /*
+             * This is the IOCtl which does the R0-initiation of the device driver.
+             * Only available at init time...
+             */
+            case D16_IOCTL_RING0INIT:
+                if (fInitTime)
+                {
+                    rc = R0Init16(pRp);
+                    return rc;
+                }
+                break;
+            /*
+             * This is the IOCtl collects info of the running kernel.
+             * Only available at init time.
+             *
+             * Since this IOCtl is issued before R0-Init is done, we'll have to
+             * init TKSSBase for both 16-bit and 32-bit code and be a bit carefull.
+             */
+            case D16_IOCTL_GETKRNLINFO:
+                if (fInitTime)
+                {
+                    ULONG ulLin;
+                    if (fInitTime && TKSSBase16 == 0)
+                        initGetDosTableData();
+                    if (DevHelp_VirtToLin(SELECTOROF(pRp->DataPacket), OFFSETOF(pRp->DataPacket),
+                                          &ulLin) != NO_ERROR)
+                        return STATUS_DONE | STERR | ERROR_I24_INVALID_PARAMETER;
+                    return CallGetKernelInfo32(ulLin);
+                }
+                break;
+            /*
+             * This is the IOCtl verifies the data in the ImportTab.
+             * Only available at init time.
+             *
+             * Since this IOCtl is issued before R0-Init is done, we'll have to
+             * init TKSSBase for both 16-bit and 32-bit code and be a bit carefull.
+             */
+            case D16_IOCTL_VERIFYIMPORTTAB:
+                if (fInitTime)
+                {
+                    if (TKSSBase16 == 0)
+                        initGetDosTableData();
+                    rc = CallVerifyImportTab32();
+                    if (pRp->DataPacket)
+                        ((PD16VERIFYIMPORTTABDATA)pRp->DataPacket)->usRc = rc;
+                    return STATUS_DONE;
+                }
+                break;
+        }
+    }
+    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;
+}
+/**
+ * Generic I/O Control - device 0.
+ * Generic I/O Control.
  * This will forward requests to 32-bit counterpart.
  * @returns   Status word.
  * @param     pRp  Request packet.
  */
 USHORT NEAR dev1GenIOCtl(PRP_GENIOCTL pRp)
+USHORT NEAR devGenIOCtl(PRP_GENIOCTL pRp)
+{
     if (pRp->Category == IOCTL_W32K_K32 || pRp->Category == IOCTL_W32K_ELF)
+    if (pRp->Category == IOCTL_W32K_K32)
+    {
-        USHORT          rc;
         RP32GENIOCTL    rp32Init = {0};
         rp32Init.rph.Len = pRp->rph.Len;
 …
             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 CallWin32kIOCtl(SSToDS_16a(&rp32Init));
+    }

branches/splittup/src/win32k/dev16/vprntf16.c

-              r5529
+              r6841
 /* $Id: vprntf16.c,v 1.6 2001-04-16 23:05:31 bird Exp $
+/* $Id: vprntf16.c,v 1.6.2.1 2001-09-27 03:08:12 bird Exp $
+ *
  * vprintf and printf - 16-bit.
 …
 #ifdef RING0
 #include "options.h"
+#define COMPORT 0x2f8
 #include "conio.h"
 #endif
 …
             if (ch == '\n')
+            {
                 while (!(inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
                 outp(options.usCom, chReturn);             /* Put the char. */
+                while (!(inp(COMPORT + 5) & 0x20));  /* Waits for the port to be ready. */
+                outp(COMPORT, chReturn);             /* Put the char. */
+            }
             while (!(inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
             outp(options.usCom, ch);                   /* Put the char. */
+            while (!(inp(COMPORT + 5) & 0x20));  /* Waits for the port to be ready. */
+            outp(COMPORT, ch);                   /* Put the char. */
             /* Yield(); - no 16-bit yield */
+        }
 …
             for (ul = 0; ul < cch; ul++)
+            {
                 while (!(inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
                 outp(options.usCom, psz[ul]);              /* Put the char. */
+                while (!(inp(COMPORT + 5) & 0x20));  /* Waits for the port to be ready. */
+                outp(COMPORT, psz[ul]);              /* Put the char. */
+            }
 …
                 if (psz[cch] == '\n')
+                {
                     while (!(inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
                     outp(options.usCom, chReturn);             /* Put the char. */
                     while (!(inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
                     outp(options.usCom, chNewLine);            /* Put the char. */
+                    while (!(inp(COMPORT + 5) & 0x20));  /* Waits for the port to be ready. */
+                    outp(COMPORT, chReturn);             /* Put the char. */
+                    while (!(inp(COMPORT + 5) & 0x20));  /* Waits for the port to be ready. */
+                    outp(COMPORT, chNewLine);            /* Put the char. */
                     cchYield ++;
+                }

branches/splittup/src/win32k/dev32/d32CallGate.asm

-              r6280
+              r6841
 ; $Id: d32CallGate.asm,v 1.5 2001-07-10 05:19:33 bird Exp $
+; $Id: d32CallGate.asm,v 1.5.2.1 2001-09-27 03:08:12 bird Exp $
+;
 ; 32-bit CallGate used to communitcate fast between Ring-3 and Ring-0.
 …
+;
     extrn  _Device_Help:dword
     extrn  pulTKSSBase32:dword
+    extrn  _TKSSBase:dword
     extrn  KMEnterKmodeSEF:near
 …
     mov     ecx, acbK32Params[eax*4]    ; ecx <- size of parameter packet.
     sub     esp, ecx                    ; Reserve stack space for the parameter packet.
+    mov     eax, [pulTKSSBase32]        ; Calculate the FLAT address of esp.
+    mov     eax, [eax]
+    mov     eax, _TKSSBase              ; Calculate the FLAT address of esp.
     add     eax, esp                    ; eax <- flat address of ss:esp
     push    ecx                         ; Save the size.

branches/splittup/src/win32k/dev32/d32Events.asm

-              r5247
+              r6841
 ; $Id: d32Events.asm,v 1.2 2001-02-23 02:57:53 bird Exp $
+; $Id: d32Events.asm,v 1.2.2.1 2001-09-27 03:08:13 bird Exp $
+;
 ; d32Events - Code for overriding system events.
 …
+;
     extrn   aSysEventsOverrides:dword
-    extrn    _TKSSBase16:dword
     extrn   dh_SendEvent:near
     extrn   dh_SendEvent_sel:word

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

-              r5224
+              r6841
 /* $Id: d32Win32kIOCtl.c,v 1.7 2001-02-21 07:44:57 bird Exp $
+/* $Id: d32Win32kIOCtl.c,v 1.7.2.1 2001-09-27 03:08:13 bird Exp $
+ *
  * Win32k driver IOCtl handler function.
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"
 #include "dev1632.h"
 #include "dev32.h"
-#include "OS2Krnl.h"
 #include "Win32k.h"
 #include "k32.h"
-#include "log.h"
-#include "asmutils.h"

branches/splittup/src/win32k/dev32/d32Win32kOpenClose.c

-              r6296
+              r6841
 /* $Id: d32Win32kOpenClose.c,v 1.2 2001-07-10 16:39:16 bird Exp $
+/* $Id: d32Win32kOpenClose.c,v 1.2.2.1 2001-09-27 03:08:13 bird Exp $
+ *
  * Open and Close handlers for the Win32k driver.
 …
 #define INCL_OS2KRNL_LDR
 #define INCL_OS2KRNL_PTDA
+#define INCL_KKL_AVL
+#define INCL_KKL_LOG
 #define NO_WIN32K_LIB_FUNCTIONS
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"
 …
 #include "dev1632.h"
 #include "dev32.h"
-#include "OS2Krnl.h"
 #include "Win32k.h"
-#include "log.h"
-#include "asmutils.h"
-#include "avl.h"
 #include "PerTaskW32kData.h"

branches/splittup/src/win32k/dev32/d32globals.c

-              r5224
+              r6841
 /* $Id: d32globals.c,v 1.6 2001-02-21 07:44:57 bird Exp $
+/* $Id: d32globals.c,v 1.6.2.1 2001-09-27 03:08:13 bird Exp $
+ *
  * d32globals - global data (32-bit)
+ *
  * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 *   Global Variables                                                           *
 *******************************************************************************/
+/*
+ * This is the pointer to the TK(TasK)SS(Stack Segment) FLAT Base address variable.
+ * It is used by the SSToDS macro to convert stack based addresses to FLAT ds
+ * based addressed.
+ */
+PULONG          pulTKSSBase32;
+/* currently there is nothing here! */

branches/splittup/src/win32k/dev32/d32init.c

-              r6278
+              r6841
 /* $Id: d32init.c,v 1.41 2001-07-10 05:18:04 bird Exp $
+/* $Id: d32init.c,v 1.41.2.1 2001-09-27 03:08:14 bird Exp $
+ *
  * d32init.c - 32-bits init routines.
 …
 *   Defined Constants                                                          *
 *******************************************************************************/
-/*
- * Calltab entry sizes.
- */
-#define OVERLOAD16_ENTRY    0x18        /* This is intentionally 4 bytes larger than the one defined in calltaba.asm. */
-#define OVERLOAD32_ENTRY    0x14
-#define IMPORT16_ENTRY      0x08
-#define IMPORTH16_ENTRY     0x08
-#define IMPORT32_ENTRY      0x08
-#define VARIMPORT_ENTRY     0x10
-#if  0
-    #define kprintf2(a) kprintf
-#else
-    #define kprintf2(a) (void)0
-#endif
 #define INCL_DOSERRORS
 #define INCL_NOPMAPI
 …
 #define INCL_OS2KRNL_ALL
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <string.h>
 #include "devSegDf.h"
-#include "OS2Krnl.h"
 #include "options.h"
 #include "dev1632.h"
 #include "dev32.h"
 #include "dev32hlp.h"
-#include "probkrnl.h"
-#include "log.h"
-#include "asmutils.h"
-#include "malloc.h"
 #include "ldr.h"
-#include "macros.h"
-#include "errors.h"
-#ifdef R3TST
-    #include "test.h"
-    #define x86DisableWriteProtect() 0
-    #define x86RestoreWriteProtect(a) (void)0
-#endif
 …
 static char * apszInfoLevel[] = {"INFOLEVEL_QUIET", "INFOLEVEL_ERROR", "INFOLEVEL_WARNING", "INFOLEVEL_INFO", "INFOLEVEL_INFOALL", "!invalid!"};
 #endif
-PMTE    pKrnlMTE = NULL;
-PSMTE   pKrnlSMTE = NULL;
-POTE    pKrnlOTE = NULL;
 …
 *******************************************************************************/
  ULONG          readnum(const char *pszNum);
+_Inline int     ModR_M_32bit(char bModRM);
+_Inline int     ModR_M_16bit(char bModRM);
+int             interpretFunctionProlog32(char *pach, BOOL fOverload);
+int             interpretFunctionProlog16(char *pach, BOOL fOverload);
+int             importTabInit(void);
+#ifdef R3TST
+PMTE            GetOS2KrnlMTETst(void);
+void            R3TstFixImportTab(void);
+#endif
+PSZ SECCALL     nopSecPathFromSFN(SFN hFile);
+/* externs located in 16-bit data segement in ProbKrnl.c */
+extern ULONG    _TKSSBase16;
+extern USHORT   _R0FlatCS16;
+extern USHORT   _R0FlatDS16;
+/* extern(s) located in calltab.asm */
+extern char     callTab[1];
+extern char     callTab16[1];
+extern unsigned auFuncs[NBR_OF_KRNLIMPORTS];
+/**
+/*
  * Ring-0, 32-bit, init function.
  * @returns   Status word.
 …
  * @author    knut st. osmundsen
  */
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit)
+ULONG _System R0Init(RP32INIT *pRpInit)
+{
     char *      pszTmp2;
     char *      pszTmp;
-    ULONG       ul;
     APIRET      rc;
     LOCKHANDLE  lockhandle;
-    pulTKSSBase32 = (PULONG)_TKSSBase16;
     /*---------------------*/
 …
                 break;
-            case 'c':
-            case 'C': /* -C[1|2|3|4] or -Com:[1|2|3|4]  -  com-port no, def:-C2 */
-                pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL && (*pszTmp2 == ':' || *pszTmp2 == '='))
-                    pszTmp2++;
-                else
-                    pszTmp2 = pszTmp + 1;
-                ul = readnum(pszTmp2);
-                switch (ul)
+                {
-                    case 1: options.usCom = OUTPUT_COM1; break;
-                    case 2: options.usCom = OUTPUT_COM2; break;
-                    case 3: options.usCom = OUTPUT_COM3; break;
-                    case 4: options.usCom = OUTPUT_COM4; break;
+                }
-                break;
             case 'd':
             case 'D':
 …
                 else
                     options.fForcePreload = FALSE;
-                break;
-            case 'h':
-            case 'H': /* Heap options */
-                pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL && (*pszTmp2 == ':' || *pszTmp2 == '='))
+                {
-                    ul = readnum(pszTmp2 + 1);
-                    if (ul > 0x1000UL && ul < 0x2000000UL) /* 4KB < ul < 32MB */
+                    {
-                        if (strnicmp(pszTmp, "heapm", 5) == 0)
-                            options.cbSwpHeapMax = ul;
-                        else
-                            options.cbSwpHeapInit = ul;
+                    }
+                }
                 break;
 …
                         && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y');
+                }
-                else
-                {   /* ResHeap options */
-                    if (pszTmp2 != NULL && (*pszTmp2 == ':' || *pszTmp2 == '='))
+                    {
-                        ul = readnum(pszTmp2 + 1);
-                        if (ul > 0x1000UL && ul < 0x700000UL) /* 4KB < ul < 7MB */
+                        {
-                            if (strnicmp(pszTmp, "resheapm", 8) == 0)
-                                options.cbResHeapMax = ul;
-                            else
-                                options.cbResHeapInit = ul;
+                        }
+                    }
+                }
                 break;
             case 's':
+            case 'S': /* Sym:<filename> or Script:<Yes|No> or Smp */
+                /* SMP kernel */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                if (pszTmp[1] == 'c' || pszTmp[1] == 'C')
+                {
+                    options.fUNIXScript =
+                        pszTmp2 != NULL
+                        && (int)(pszTmp2-pszTmp) < cch-1
+                        && (*pszTmp2 == ':' || *pszTmp2 == '=')
+                        && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y');
+                }
+            case 'S': /* Script:<Yes|No> */
+                pszTmp2 = strpbrk(pszTmp, ":=/- ");
+                options.fUNIXScript =
+                    pszTmp2 != NULL
+                    && (int)(pszTmp2-pszTmp) < cch-1
+                    && (*pszTmp2 == ':' || *pszTmp2 == '=')
+                    && (pszTmp2[1] == 'Y' || pszTmp2[1] == 'y');
                 break;
 …
         pszTmp = strpbrk(pszTmp, "-/");
+    }
-    /* heap min/max corrections */
-    if (options.cbSwpHeapInit > options.cbSwpHeapMax)
-        options.cbSwpHeapMax = options.cbSwpHeapInit;
-    if (options.cbResHeapInit > options.cbResHeapMax)
-        options.cbResHeapMax = options.cbResHeapInit;
     /* Log option summary */
 …
     else
         kprintf(("\tlogging disabled\n"));
+    kprintf(("\tCom port no.%03xh\n", options.usCom));
+    kprintf(("\tKernel: v%d.%d  build %d%c type ",
+                options.usVerMajor,
+                options.usVerMinor,
+                options.ulBuild,
+                (options.fKernel & KF_REV_MASK)
+                    ? ((options.fKernel & KF_REV_MASK) >> KF_REV_SHIFT) + 'a'-1
+                    : ' '
+                ));
+    if (options.fKernel & KF_SMP)
+        kprintf(("SMP "));
+    else if (options.fKernel & KF_W4)
+        kprintf(("W4 "));
+    else
+        kprintf(("UNI "));
+    if (options.fKernel & KF_DEBUG)
+        kprintf(("DEBUG\n"));
+    else
+        kprintf(("\n"));
+    kprintf(("\tfPE=%d (%s)\n",     options.fPE, apszPE[MIN(options.fPE, 5)]));
+    kprintf(("\tfPEOneObject=%d (%s)\n",     options.fPEOneObject, apszPEOneObject[MIN(options.fPEOneObject, 3)]));
+    kprintf(("\tulInfoLevel=%d (%s)\n", options.ulInfoLevel, apszInfoLevel[MIN(options.ulInfoLevel, 5)]));
+    kprintf(("\tfPE=%d (%s)\n",     options.fPE, apszPE[KMIN(options.fPE, 5)]));
+    kprintf(("\tfPEOneObject=%d (%s)\n",     options.fPEOneObject, apszPEOneObject[KMIN(options.fPEOneObject, 3)]));
+    kprintf(("\tulInfoLevel=%d (%s)\n", options.ulInfoLevel, apszInfoLevel[KMIN(options.ulInfoLevel, 5)]));
     kprintf(("\tfElf=%d\n",         options.fElf));
     kprintf(("\tfUNIXScript=%d\n",  options.fUNIXScript));
 …
     kprintf(("\tfJAVA=%d\n",        options.fJava));
     kprintf(("\tfNoLoader=%d\n",    options.fNoLoader));
-    kprintf(("\tcbSwpHeapInit=0x%08x  cbSwpHeapMax=0x%08x\n",
-             options.cbSwpHeapInit, options.cbSwpHeapMax));
-    kprintf(("\tcbResHeapInit=0x%08x  cbResHeapMax=0x%08x\n",
-             options.cbResHeapInit, options.cbResHeapMax));
     kprintf(("Options - Summary - End\n"));
     #endif /* debug */
 …
      * init sub-parts
      */
-    /* heap */
-    if (heapInit(options.cbResHeapInit, options.cbResHeapMax,
-                 options.cbSwpHeapInit, options.cbSwpHeapMax) != NO_ERROR)
-        return ERROR_D32_HEAPINIT_FAILED;
     /* loader */
+    if (ldrInit() != NO_ERROR)
+        return ERROR_D32_LDR_INIT_FAILED;
+    /* functionoverrides */
+    if ((rc = importTabInit()) != NO_ERROR)
+        return (USHORT)rc;
+    if ((rc = ldrInit()) != NO_ERROR)
+        return rc;
     /* apis */
     #if 0
     if ((rc = APIInit()) != NO_ERROR)
         return (USHORT)rc;
+        return rc;
     #endif
 …
+    {
         kprintf(("R0Init32: InitCallGate failed with rc=%d\n", rc));
         return (USHORT)rc;
+        return rc;
+    }
     #endif
 …
     /* 32-bit data segment */
     memset(SSToDS(&lockhandle), 0, sizeof(lockhandle));
     rc = D32Hlp_VMLock2(callTab,
                         &CONST32_ROEND - (char*)callTab,
+    rc = D32Hlp_VMLock2(&DATA32START,
+                        &CONST32_ROEND - &DATA32START,
                         VMDHL_LONG | VMDHL_WRITE,
                         SSToDS(&lockhandle));
 …
+}
-/**
- * Get kernel OTEs
- * This function set pKrnlMTE, pKrnlSMTE and pKrnlOTE.
- * @returns   Strategy return code:
- *            STATUS_DONE on success.
- *            STATUS_DONE | STERR | errorcode on failure.
- * @param     pKrnlInfo  Pointer to output buffer.
- *                       If NULL only the three global variables are set.
- * @status    completely implemented and tested.
- * @author    knut st. osmundsen
- * @remark    Called from IOCtl.
- *            WARNING! This function is called before the initroutine (R0INIT)!
- */
-USHORT _loadds _Far32 _Pascal GetKernelInfo32(PKRNLINFO pKrnlInfo)
+{
-    int     i;
-    USHORT  usRc;
-    /* VerifyImportTab32 is called before the initroutine! */
-    pulTKSSBase32 = (PULONG)_TKSSBase16;
-    /* Find the kernel OTE table */
-#ifndef R3TST
-    pKrnlMTE = GetOS2KrnlMTE();
-#else
-    pKrnlMTE = GetOS2KrnlMTETst();
-#endif
-    if (pKrnlMTE != NULL)
+    {
-        pKrnlSMTE = pKrnlMTE->mte_swapmte;
-        if (pKrnlSMTE != NULL)
+        {
-            if (pKrnlSMTE->smte_objcnt <= MAXKRNLOBJECTS)
+            {
-                pKrnlOTE = pKrnlSMTE->smte_objtab;
-                if (pKrnlOTE != NULL)
+                {
-                    BOOL    fKrnlTypeOk;
-                    /*
-                     * Thats all?
-                     */
-                    if (pKrnlInfo == NULL)
-                        return NO_ERROR;
-                    pKrnlInfo->cObjects = (unsigned char)pKrnlSMTE->smte_objcnt;
-                    /*
-                     * Copy OTEs
-                     */
-                    for (i = 0; i < pKrnlInfo->cObjects; i++)
+                    {
-                        memcpy((void*)&pKrnlInfo->aObjects[i], &pKrnlOTE[i], sizeof(OTE));
-                        kprintf2(("GetKernelInfo32: %d base=0x%08x size=0x%08x flags=0x%08x\n",
-                                  i, pKrnlOTE[i].ote_base, pKrnlOTE[i].ote_size, pKrnlOTE[i].ote_flags));
+                    }
-                    usRc = 0;
-                    /*
-                     * Search for internal revision stuff AND 'SAB KNL?' signature in the two first objects.
-                     */
-                    fKrnlTypeOk = FALSE;
-                    pKrnlInfo->fKernel = 0;
-                    pKrnlInfo->ulBuild = 0;
-                    for (i = 0; i < 2 && pKrnlInfo->ulBuild == 0; i++)
+                    {
-                        const char *psz = (const char*)pKrnlOTE[i].ote_base;
-                        const char *pszEnd = psz + pKrnlOTE[i].ote_size - 50; /* Last possible search position. */
-                        while (psz < pszEnd)
+                        {
-                            if (strncmp(psz, "Internal revision ", 18) == 0 && (psz[18] >= '0' && psz[18] <= '9'))
+                            {
-                                int j;
-                                kprintf2(("GetKernelInfo32: found internal revision: '%s'\n", psz));
-                                /* skip to end of "Internal revision " string. */
-                                psz += 18;
-                                /* Read number*/
-                                while ((*psz >= '0' && *psz <= '9') || *psz == '.')
+                                {
-                                    if (*psz != '.')
-                                        pKrnlInfo->ulBuild = (unsigned short)(pKrnlInfo->ulBuild * 10 + (*psz - '0'));
-                                    psz++;
+                                }
-                                /* Check if build number seems valid. */
-                                if (   !(pKrnlInfo->ulBuild >=  8254 && pKrnlInfo->ulBuild <  8383) /* Warp 3 fp 32 -> fp 60 */
-                                    && !(pKrnlInfo->ulBuild >=  9023 && pKrnlInfo->ulBuild <= 9036) /* Warp 4 GA -> fp 12 */
-                                    && !(pKrnlInfo->ulBuild >= 14039 && pKrnlInfo->ulBuild < 14100) /* Warp 4.5 GA -> fp 40 */
-                                    && !(pKrnlInfo->ulBuild >=  6600 && pKrnlInfo->ulBuild <= 6678) /* Warp 2.1x fix?? (just for fun!) */
+                                      )
+                                {
-                                    kprintf(("GetKernelInfo32: info summary: Build %d is invalid - invalid fixpack?\n", pKrnlInfo->ulBuild));
-                                    usRc = ERROR_D32_INVALID_BUILD;
-                                    break;
+                                }
-                                /* Check for any revision flag */
-                                if ((*psz >= 'A' && *psz <= 'Z') || (*psz >= 'a' && *psz <= 'z'))
+                                {
-                                    pKrnlInfo->fKernel |= (USHORT)((*psz - (*psz >= 'a' ? 'a'-1 : 'A'-1)) << KF_REV_SHIFT);
-                                    psz++;
+                                }
-                                if (*psz == ',') /* This is ignored! */
-                                    *psz++;
-                                /* If this is an Aurora/Warp 4.5 or Warp 3 kernel there is more info! */
-                                if (psz[0] == '_' && (psz[1] == 'S' || psz[1] == 's'))  /* _SMP  */
-                                    pKrnlInfo->fKernel |= KF_SMP;
-                                else
-                                    if (*psz != ','
-                                        && (   (psz[0] == '_' && psz[1] == 'W' && psz[2] == '4')  /* _W4 */
-                                            || (psz[0] == '_' && psz[1] == 'U' && psz[2] == 'N' && psz[3] == 'I' && psz[4] == '4')  /* _UNI4 */
+                                            )
+                                        )
-                                    pKrnlInfo->fKernel |= KF_W4 | KF_UNI;
-                                else
-                                    pKrnlInfo->fKernel |= KF_UNI;
-                                /* Check if its a debug kernel (look for DEBUG at start of object 3-5) */
-                                if (!fKrnlTypeOk)
+                                {
-                                    j = 3;
-                                    while (j < 5)
+                                    {
-                                        /* There should be no iopl object preceding the debugger data object. */
-                                        if ((pKrnlOTE[j].ote_flags & OBJIOPL) != 0)
-                                            break;
-                                        /* Is this is? */
-                                        if ((pKrnlOTE[j].ote_flags & OBJINVALID) == 0
-                                            && (pKrnlOTE[j].ote_flags & (OBJREAD | OBJWRITE)) == (OBJREAD | OBJWRITE)
-                                            && strncmp((char*)pKrnlOTE[j].ote_base, "DEBUG", 5) == 0)
+                                        {
-                                            pKrnlInfo->fKernel |= KF_DEBUG;
-                                            break;
+                                        }
-                                        j++;
+                                    }
+                                }
-                                /* Display info */
-                                kprintf(("GetKernelInfo32: info summary: Build %d, fKernel=0x%x\n",
-                                         pKrnlInfo->ulBuild, pKrnlInfo->fKernel));
-                                /* Break out */
-                                break;
+                            }
-                            /*
-                             * Look for the SAB KNL? signature to check which kernel type we're
-                             * dealing with. This could also be reached thru the selector found
-                             * in the first element for the SAS_tables_area array.
-                             */
-                            if (!fKrnlTypeOk && strncmp(psz, "SAB KNL", 7) == 0)
+                            {
-                                fKrnlTypeOk = TRUE;
-                                if (psz[7] == 'D')
-                                    pKrnlInfo->fKernel |= KF_ALLSTRICT;
-                                else if (psz[7] == 'B')
-                                    pKrnlInfo->fKernel |= KF_HALFSTRICT;
-                                else if (psz[7] != 'R')
-                                    fKrnlTypeOk = FALSE;
+                            }
-                            /* next */
-                            psz++;
-                        } /* while loop searching for "Internal revision " */
-                    } /* for loop on objects 0-1. */
-                    /* Set error code if not found */
-                    if (pKrnlInfo->ulBuild == 0)
+                    {
-                        usRc = ERROR_D32_BUILD_INFO_NOT_FOUND;
-                        kprintf(("GetKernelInfo32: Internal revision was not found!\n"));
+                    }
+                }
-                else
-                    usRc = ERROR_D32_NO_OBJECT_TABLE;
+            }
-            else
-                usRc = ERROR_D32_TOO_MANY_OBJECTS;
+        }
-        else
-            usRc = ERROR_D32_NO_SWAPMTE;
+    }
-    else
-        usRc = ERROR_D32_GETOS2KRNL_FAILED;
-    if (usRc != NO_ERROR)
-        kprintf(("GetKernelInfo32: failed. usRc = %d\n", usRc));
-    return (USHORT)(usRc | (usRc != NO_ERROR ? STATUS_DONE | STERR : STATUS_DONE));
+}
-/**
- * Functions which cacluates the instructionsize given a ModR/M byte.
- * @returns   Number of bytes to add to cb and pach.
- * @param     bModRM  ModR/M byte.
- * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- */
-int ModR_M_32bit(char bModRM)
+{
-    if ((bModRM & 0xc0) == 0x80  /* ex. mov ax,[ebp+11145543h] */
-        || ((bModRM & 0xc0) == 0 && (bModRM & 0x07) == 5)) /* ex. mov ebp,[0ff231234h] */
-    {   /* 32-bit displacement */
-        return 5 + ((bModRM & 0x7) == 0x4); // + SIB
+    }
-    else if ((bModRM & 0xc0) == 0x40) /* ex. mov ecx,[esi]+4fh */
-    {   /* 8-bit displacement */
-        return 2 + ((bModRM & 0x7) == 0x4); // + SIB
+    }
-    /* no displacement (only /r byte) */
-    return 1;
+}
-/**
- * Functions which cacluates the instructionsize given a ModR/M byte.
- * @returns   Number of bytes to add to cb and pach.
- * @param     bModRM  ModR/M byte.
- * @status    completely implemented.
- * @author    knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- */
-int ModR_M_16bit(char bModRM)
+{
-    if ((bModRM & 0xc0) == 0x80  /* ex. mov ax,[ebp+11145543h] */
-        || ((bModRM & 0xc0) == 0 && (bModRM & 0x07) == 5)) /* ex. mov ebp,[0ff231234h] */
-    {   /* 16-bit displacement */
-        return 4;
+    }
-    else if ((bModRM & 0xc0) == 0x40) /* ex. mov ecx,[esi]+4fh */
-    {   /* 8-bit displacement */
-        return 2;
+    }
-    /* no displacement (only /r byte) */
-    return 1;
+}
-/**
- * 32-bit! Interpret function prolog to find where to jmp back.
- * @returns   Length of prolog need to be copied - which is also the offset of
- *            where the jmp instr should be placed.
- *            On error it returns 0.
- * @param     pach       Pointer to prolog.
- * @param     fOverload  TRUE:  Function is to be overloaded.
- *                       FALSE: Function is to be imported.
- */
-int interpretFunctionProlog32(char *pach, BOOL fOverload)
+{
-    int cb = -3;
-    kprintf2(("interpretFunctionProlog32(0x%08x, %d):\n"
-              "\t%02x %02x %02x %02x - %02x %02x %02x %02x\n"
-              "\t%02x %02x %02x %02x - %02x %02x %02x %02x\n",
-              pach, fOverload,
-              pach[0], pach[1], pach[2], pach[3], pach[4], pach[5], pach[6], pach[7],
-              pach[8], pach[9], pach[10],pach[11],pach[12],pach[13],pach[14],pach[15]));
-    /*
-     * check for the well known prolog (the only that is supported now)
-     * which is:
-     *     push ebp
-     *     mov ebp,esp
-     *  or
-     *     push ebp
-     *     mov eax, dword ptr [xxxxxxxx]
-     *  or
-     *     sub esp, imm8
-     *     push ebx
-     *     push edi
+     *
-     * These are allowed when not overloading:
-     *     mov eax, imm32
-     *     jmp short
-     *  or
-     *     mov eax, imm32
-     *     push ebp
-     *  or
-     *     mov ecx, r/m32
-     *  or
-     *     jmp dword
-     *  or
-     *     sub esp, imm8
-     *  or
-     *     call ptr16:32
-     *  or
-     *     enter imm16, imm8    (2.1x)
-     *  or
-     *     mov eax, imm32       (2.1x)
-     *     <anything>
-     *  or
-     *     xor r32, r/m32
-     *  or
-     *     mov eax, msoff32
-     *  or
-     *     push edi
-     *     mov eax, dword ptr [xxxxxxxx]
-     *  or
-     *     movzx esp, sp
-     *  or
-     *     call rel32
-     *     popf
-     */
-    if ((pach[0] == 0x55 && (pach[1] == 0x8b || pach[1] == 0xa1)) /* the two first prologs */
-        ||
-        (pach[0] == 0x83 &&  pach[3] == 0x53 && pach[4] == 0x57)  /* the third prolog */
-        ||
-        (pach[0] == 0xB8 && (pach[5] == 0xEB || pach[5] == 0x55) && !fOverload) /* the two next prologs */
-        ||
-        (pach[0] == 0x8B && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0xFF && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0x83 && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0x9a && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0xc8)               /* the next prolog */
-        ||
-        (pach[0] == 0xB8 && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0x33 && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0xa1 && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0x57 &&  pach[1] == 0x8b && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0x0f &&  pach[1] == 0xb7 && pach[2] == 0xe4 && !fOverload) /* the next prolog */
-        ||
-        (pach[0] == 0xe8 &&  pach[5] == 0x9d && !fOverload) /* the next prolog */
-        /*      push ebx
-         *      push edi
-         *      push imm32
-         */
-        || (pach[0] == 0x53 &&  pach[1] == 0x57 &&  pach[2] == 0x68 && !fOverload)
-        /*      push ebx
-         *      push edi
-         *      push esi
-         *      mov /r
-         */
-        || (pach[0] == 0x53 &&  pach[1] == 0xe8 && !fOverload)
-        /*      push ebx
-         *      push edi
-         *      push esi
-         *      mov /r
-         */
-        || (pach[0] == 0x53 &&  pach[1] == 0x57 &&  pach[2] == 0x56 &&  pach[3] == 0x8b  && !fOverload)
-        /*      pop  eax
-         *      push imm8
-         *      push eax
-         *      jmp  imm32
-         */
-        ||  (pach[0] == 0x58 &&  pach[1] == 0x6a &&  pach[3] == 0x50 &&  pach[4] == 0xe9  && !fOverload)
-        /*      push imm32
-         *      call imm32
-         */
-        || (pach[0] == 0x68 && pach[5] == 0xe8 && !fOverload)
+        )
+    {
-        BOOL fForce = FALSE;
-        int  cbWord = 4;
-        cb = 0;
-        while (cb < 5 || fForce)                  /* 5 is the size of a jump instruction. */
+        {
-            int cb2;
-            if (!fForce && cbWord != 4)
-                cbWord = 4;
-            fForce = FALSE;
-            switch (*pach)
+            {
-                case 0x0f:
-                    if (pach[1] != 0xb7 && pach[2] != 0xe4) /* movzx esp, sp */
+                    {
-                        kprintf(("interpretFunctionProlog32: unknown instruction 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                        return -11;
+                    }
-                    pach += 2;
-                    cb += 2;
-                    break;
-                /* simple one byte prefixes */
-                case 0x2e:              /* cs segment override */
-                case 0x36:              /* ss segment override */
-                case 0x3e:              /* ds segment override */
-                case 0x26:              /* es segment override */
-                case 0x64:              /* fs segment override */
-                case 0x65:              /* gs segment override */
-                    fForce = TRUE;
-                    break;
-                case 0x66:              /* 16 bit */
-                    fForce = TRUE;
-                    cbWord = 2;
-                    break;
-                /* simple one byte instructions e*/
-                case 0x50:              /* push eax */
-                case 0x51:              /* push ecx */
-                case 0x52:              /* push edx */
-                case 0x53:              /* push ebx */
-                case 0x54:              /* push esp */
-                case 0x55:              /* push ebp */
-                case 0x56:              /* push esi */
-                case 0x57:              /* push edi */
-                case 0x58:              /* pop  eax */
-                case 0x59:              /* pop  ecx */
-                case 0x5a:              /* pop  edx */
-                case 0x5b:              /* pop  ebx */
-                case 0x06:              /* push es */
-                case 0x0e:              /* push cs */
-                case 0x1e:              /* push ds */
-                case 0x16:              /* push ss */
-                    break;
-                /* simple two byte instructions */
-                case 0xb0:              /* mov al, imm8 */
-                case 0xb1:              /* mov cl, imm8 */
-                case 0xb2:              /* mov dl, imm8 */
-                case 0xb3:              /* mov bl, imm8 */
-                case 0xb4:              /* mov ah, imm8 */
-                case 0xb5:              /* mov ch, imm8 */
-                case 0xb6:              /* mov dh, imm8 */
-                case 0xb7:              /* mov bh, imm8 */
-                case 0x2c:              /* sub al, imm8 */
-                case 0x34:              /* xor al, imm8 */
-                case 0x3c:              /* cmp al, imm8 */
-                case 0x6a:              /* push <byte> */
-                case 0xa0:              /* mov al, moffs8 */
-                case 0xa2:              /* mov moffs8, al */
-                    pach++;
-                    cb++;
-                    break;
-                /* simple five byte instructions */
-                case 0xb8:              /* mov eax, imm32 */
-                case 0xb9:              /* mov ecx, imm32 */
-                case 0xba:              /* mov edx, imm32 */
-                case 0xbb:              /* mov ebx, imm32 */
-                case 0xbc:              /* mov esx, imm32 */
-                case 0xbd:              /* mov ebx, imm32 */
-                case 0xbe:              /* mov esi, imm32 */
-                case 0xbf:              /* mov edi, imm32 */
-                case 0xe9:              /* jmp rel32 */
-                case 0x2d:              /* sub eax, imm32 */
-                case 0x35:              /* xor eax, imm32 */
-                case 0x3d:              /* cmp eax, imm32 */
-                case 0x68:              /* push <dword> */
-                case 0xa1:              /* mov eax, moffs16 */
-                case 0xa3:              /* mov moffs16, eax */
-                    pach += cbWord;
-                    cb += cbWord;
-                    break;
-                /* fixed five byte instructions */
-                case 0xe8:              /* call imm32 */
-                    pach += 4;
-                    cb += 4;
-                    break;
-                /* complex sized instructions -  "/r" */
-                case 0x30:              /* xor r/m8,  r8 */
-                case 0x31:              /* xor r/m32, r32 */
-                case 0x32:              /* xor r8,  r/m8 */
-                case 0x33:              /* xor r32, r/m32 */
-                case 0x38:              /* cmp r/m8, r8 */
-                case 0x39:              /* cmp r/m32, r32 */
-                case 0x3a:              /* cmp r8, r/m8 */
-                case 0x3b:              /* cmp r32, r/m32 */
-                case 0x28:              /* sub r/m8, r8 */
-                case 0x29:              /* sub r/m32, r32 */
-                case 0x2a:              /* sub r8, r/m8 */
-                case 0x2b:              /* sub r32, r/m32 */
-                case 0x8b:              /* mov /r */
-                case 0x8d:              /* lea /r */
-                    cb += cb2 = ModR_M_32bit(pach[1]);
-                    pach += cb2;
-                    break;
-                /* complex sized instruction - "/5 ib" */
-                case 0x80:              /* 5: sub r/m8, imm8  7: cmp r/m8, imm8 */
-                case 0x83:              /* 5: sub r/m32, imm8 7: cmp r/m32, imm8 */
-                    if ((pach[1] & 0x38) == (5<<3)
-                        || (pach[1] & 0x38) == (7<<3)
+                        )
+                    {
-                        cb += cb2 = 1 + ModR_M_32bit(pach[1]); /* 1 is the size of the imm8 */
-                        pach += cb2;
+                    }
-                    else
+                    {
-                        kprintf(("interpretFunctionProlog32: unknown instruction (-3) 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                        return -3;
+                    }
-                    break;
-                /* complex sized instruction - "/digit id" */
-                case 0x81:              /* sub r/m32, imm32 + more instructions! */
-                    if ((pach[1] & 0x38) == (5<<3)       /* sub r/m32, imm32  */
-                        || (pach[1] & 0x38) == (7<<3)    /* cmp r/m32, imm32  */
+                        )
+                    {
-                        cb += cb2 = cbWord + ModR_M_32bit(pach[1]); /* cbWord is the size of the imm32/imm16 */
-                        pach += cb2;
+                    }
-                    else
+                    {
-                        kprintf(("interpretFunctionProlog32: unknown instruction (-2) 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                        return -2;
+                    }
-                    break;
-                case 0x9a:              /* call ptr16:32 */
-                    cb += cb2 = 6;
-                    pach += cb2;
-                    break;
-                case 0xc8:              /* enter imm16, imm8 */
-                    cb += cb = 3;
-                    pach += cb2;
-                    break;
-                /*
-                 * jmp /digit
-                 */
-                case 0xff:
-                    cb += cb2 = cbWord + ModR_M_32bit(pach[1]); /* cbWord is the size of the imm32/imm16 */
-                    pach += cb2;
-                    break;
-                default:
-                    kprintf(("interpretFunctionProlog32: unknown instruction 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                    return 0;
+            }
-            pach++;
-            cb++;
+        }
+    }
-    else
+    {
-        kprintf(("interpretFunctionProlog32: unknown prolog start. 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
-                 pach[0], pach[1], pach[2], pach[3], pach[4], pach[5]));
-        cb = 0;
+    }
-    return cb;
+}
-/**
- * 16-bit! Interpret function prolog to find where to jmp back.
- * @returns   Length of prolog need to be copied - which is also the offset of
- *            where the jmp instr should be placed.
- *            On error it returns 0.
- * @param     pach       Pointer to prolog.
- * @param     fOverload  TRUE:  Function is to be overloaded.
- *                       FALSE: Function is to be imported.
- */
-int interpretFunctionProlog16(char *pach, BOOL fOverload)
+{
-    int cb = -7;
-    kprintf2(("interpretFunctionProlog16(0x%08x, %d):\n"
-              "\t%02x %02x %02x %02x - %02x %02x %02x %02x\n"
-              "\t%02x %02x %02x %02x - %02x %02x %02x %02x\n",
-              pach, fOverload,
-              pach[0], pach[1], pach[2], pach[3], pach[4], pach[5], pach[6], pach[7],
-              pach[8], pach[9], pach[10],pach[11],pach[12],pach[13],pach[14],pach[15]));
-    /*
-     * Check for the well known prolog (the only that is supported now)
-     * which is:
-     */
-    if ((*pach == 0x6A && !fOverload)       /* push 2 (don't check for the 2) */
-        ||
-        *pach == 0x60                       /* pushf */
-        ||
-        (*pach == 0x53 && pach[1] == 0x51)  /* push bx, push cx */
-        ||
-        (*pach == 0x8c && pach[1] == 0xd8)  /* mov ax, ds */
-        ||
-        (*pach == 0xb8)                     /* mov ax, imm16 */
+        )
+    {
-        BOOL fForce;
-        int  cOpPrefix = 0;
-        cb = 0;
-        while (cb < 5  || fForce)       /* 5 is the size of a 16:16 far jump instruction. */
+        {
-            int cb2;
-            fForce = FALSE;
-            switch (*pach)
+            {
-                case 0x06:              /* push es */
-                case 0x0e:              /* push cs */
-                case 0x1e:              /* push ds */
-                case 0x16:              /* push ss */
-                    break;
-                case 0x0f:              /* push gs and push fs */
-                    if (pach[1] != 0xA0 && pach[1] != 0xA8)
+                    {
-                        kprintf(("interpretFunctionProlog16: unknown instruction 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                        return -11;
+                    }
-                    pach++;
-                    cb++;
-                    break;
-                case 0x50:              /* push ax */
-                case 0x51:              /* push cx */
-                case 0x52:              /* push dx */
-                case 0x53:              /* push bx */
-                case 0x54:              /* push sp */
-                case 0x55:              /* push bp */
-                case 0x56:              /* push si */
-                case 0x57:              /* push di */
-                case 0x60:              /* pusha */
-                    break;
-                /* simple three byte instructions */
-                case 0xb8:              /* mov eax, imm16 */
-                case 0xb9:              /* mov ecx, imm16 */
-                case 0xba:              /* mov edx, imm16 */
-                case 0xbb:              /* mov ebx, imm16 */
-                case 0xbc:              /* mov esx, imm16 */
-                case 0xbd:              /* mov ebx, imm16 */
-                case 0xbe:              /* mov esi, imm16 */
-                case 0xbf:              /* mov edi, imm16 */
-                case 0x2d:              /* sub eax, imm16 */
-                case 0x35:              /* xor eax, imm16 */
-                case 0x3d:              /* cmp eax, imm16 */
-                case 0x68:              /* push <dword> */
-                case 0xa1:              /* mov eax, moffs16 */
-                case 0xa3:              /* mov moffs16, eax */
-                    if (cOpPrefix > 0)  /* FIXME see 32-bit interpreter. */
+                    {
-                        pach += 2;
-                        cb += 2;
+                    }
-                    pach += 2;
-                    cb += 2;
-                    break;
-                case 0x2e:              /* cs segment override */
-                case 0x36:              /* ss segment override */
-                case 0x3e:              /* ds segment override */
-                case 0x26:              /* es segment override */
-                case 0x64:              /* fs segment override */
-                case 0x65:              /* gs segment override */
-                    fForce = TRUE;
-                    if (cOpPrefix > 0)
-                        cOpPrefix++;
-                    break;
-                case 0x66:
-                    cOpPrefix = 2;      /* it's decremented once before it's used. */
-                    fForce = TRUE;
-                    break;
-                case 0x6a:              /* push <byte> */
-                case 0x3c:              /* mov al, imm8 */
-                    pach++;
-                    cb++;
-                    break;
-                case 0x8b:              /* mov /r */
-                case 0x8c:              /* mov r/m16,Sreg  (= mov /r) */
-                case 0x8e:              /* mov Sreg, r/m16 (= mov /r) */
-                    if ((pach[1] & 0xc0) == 0x80  /* ex. mov ax,bp+1114h */
-                        || ((pach[1] & 0xc0) == 0 && (pach[1] & 0x7) == 6)) /* ex. mov bp,0ff23h */
-                    {   /* 16-bit displacement */
-                        if (cOpPrefix > 0)
+                        {
-                            pach += 2;
-                            cb += 2;
+                        }
-                        pach += 3;
-                        cb += 3;
+                    }
-                    else
-                        if ((pach[1] & 0xc0) == 0x40) /* ex. mov ax,[si]+4fh */
-                    {   /* 8-bit displacement */
-                        pach += 2;
-                        cb += 2;
+                    }
-                    else
-                    {   /* no displacement (only /r byte) */
-                        pach++;
-                        cb++;
+                    }
-                    break;
-                /* complex sized instruction - "/5 ib" */
-                case 0x80:              /* 5: sub r/m8, imm8  7: cmp r/m8, imm8 */
-                case 0x83:              /* 5: sub r/m16, imm8 7: cmp r/m16, imm8 */
-                    if ((pach[1] & 0x38) == (5<<3)
-                        || (pach[1] & 0x38) == (7<<3)
+                        )
+                    {
-                        cb += cb2 = 1 + ModR_M_16bit(pach[1]); /* 1 is the size of the imm8 */
-                        pach += cb2;
+                    }
-                    else
+                    {
-                        kprintf(("interpretFunctionProlog16: unknown instruction (-3) 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                        return -3;
+                    }
-                    break;
-                case 0x9a:              /* call ptr16:16 */
-                    cb += cb2 = 4;
-                    pach += cb2;
-                    break;
-                default:
-                    kprintf(("interpretFunctionProlog16: unknown instruction 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-                    return 0;
+            }
-            pach++;
-            cb++;
-            if (cOpPrefix > 0)
-                cOpPrefix--;
+        }
+    }
-    else
-        kprintf(("interpretFunctionProlog16: unknown prolog 0x%x 0x%x 0x%x\n", pach[0], pach[1], pach[2]));
-    fOverload = fOverload;
-    return cb;
+}
-/**
- * Verifies the aImportTab.
- * @returns   16-bit errorcode where the high byte is the procedure number which
- *            the error occured on and the low byte the error code.
- * @remark    Called from IOCtl.
- *            WARNING! This function is called before the initroutine (R0INIT)!
- */
-USHORT _loadds _Far32 _Pascal VerifyImportTab32(void)
+{
-    USHORT  usRc;
-    int     i;
-    int     cb;
-    int     cbmax;
-    /* VerifyImporTab32 is called before the initroutine! */
-    pulTKSSBase32 = (PULONG)_TKSSBase16;
-    /* Check that pKrnlOTE is set */
-    usRc = GetKernelInfo32(NULL);
-    if (usRc != NO_ERROR)
-        return usRc;
-    /*
-     * Verify aImportTab.
-     */
-    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+    {
-        /*
-         * Debug info
-         */
-        kprintf2(("VerifyImportTab32: procedure no.%d is being checked: %s addr=0x%08x iObj=%d offObj=%d\n",
-                  i, &aImportTab[i].achName[0], aImportTab[i].ulAddress,
-                  aImportTab[i].iObject, aImportTab[i].offObject));
-        /* Verify that it is found */
-        if (!aImportTab[i].fFound)
+        {
-            if (EPTNotReq(aImportTab[i]))
-                continue;
-            else
+            {
-                kprintf(("VerifyImportTab32: procedure no.%d was not fFound!\n", i));
-                return (USHORT)(ERROR_D32_PROC_NOT_FOUND | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG);
+            }
+        }
-        /* Verify read/writeable. */
-        if (   aImportTab[i].iObject >= pKrnlSMTE->smte_objcnt                                /* object index valid? */
-            || aImportTab[i].ulAddress < pKrnlOTE[aImportTab[i].iObject].ote_base          /* address valid? */
-            || aImportTab[i].ulAddress + 16 > (pKrnlOTE[aImportTab[i].iObject].ote_base +
-                                                pKrnlOTE[aImportTab[i].iObject].ote_size)  /* address valid? */
-            || aImportTab[i].ulAddress - aImportTab[i].offObject
-               != pKrnlOTE[aImportTab[i].iObject].ote_base                                 /* offObject ok?  */
+            )
+        {
-            kprintf(("VerifyImportTab32: procedure no.%d has an invalid address or object number.!\n"
-                     "                   %s  addr=0x%08x iObj=%d offObj=%d\n",
-                     i, &aImportTab[i].achName[0], aImportTab[i].ulAddress,
-                     aImportTab[i].iObject, aImportTab[i].offObject));
-            return (USHORT)(ERROR_D32_INVALID_OBJ_OR_ADDR | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG);
+        }
-        #ifndef R3TST
-        if (aImportTab[i].ulAddress < 0xff400000UL)
+        {
-            kprintf(("VerifyImportTab32: procedure no.%d has an invalid address, %#08x!\n",
-                     i, aImportTab[i].ulAddress));
-            return (USHORT)(ERROR_D32_INVALID_ADDRESS | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG);
+        }
-        #endif
-        switch (aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ | EPT_WRAPPED | EPT_PROCIMPORTH))
+        {
-            case EPT_PROC:
-            case EPT_PROCIMPORT:
-                /*
-                 * Verify known function prolog.
-                 */
-                if (EPT32BitEntry(aImportTab[i]))
+                {
-                    cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, EPT32Proc(aImportTab[i]));
-                    cbmax = OVERLOAD32_ENTRY - 5; /* 5 = Size of the jump instruction */
+                }
-                else
+                {
-                    cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, EPT16Proc(aImportTab[i]));
-                    cbmax = OVERLOAD16_ENTRY - 5; /* 5 = Size of the jump instruction */
+                }
-                /*
-                 * Check result of the function prolog interpretations.
-                 */
-                if (cb <= 0 || cb > cbmax)
-                {   /* failed, too small or too large. */
-                    kprintf(("VerifyImportTab32/16: verify failed for procedure no.%d (cb=%d), %s\n", i, cb, aImportTab[i].achName));
-                    return (USHORT)(ERROR_D32_TOO_INVALID_PROLOG | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG);
+                }
-                break;
-            case EPT_VARIMPORT:
-                /* do nothing! */
-                break;
-            default:
-                kprintf(("VerifyImportTab32: invalid type/type not implemented. Proc no.%d, %s\n",i, aImportTab[i].achName));
-                Int3(); /* temporary fix! */
-                return (USHORT)(ERROR_D32_NOT_IMPLEMENTED | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG);
+        }
+    }
-    return NO_ERROR;
+}
-/**
- * Initiates the overrided functions.
- * @returns   16-bit errorcode where the high byte is the procedure number which
- *            the error occured on and the low byte the error code.
- */
-int importTabInit(void)
+{
-    int     i;
-    int     cb;
-    int     cbmax;
-    char *  pchCTEntry;                 /* Pointer to current 32-bit calltab entry. */
-    char *  pchCTEntry16;               /* Pointer to current 16-bit calltab entry. */
-    ULONG   flWP;                       /* CR0 WP flag restore value. */
-    /*
-     * Apply build specific changes to the auFuncs table
-     */
-    if (options.ulBuild < 14053)
+    {
-        #ifdef DEBUG
-        if (auFuncs[0] != (unsigned)myldrOpenPath)
+        {
-            kprintf(("importTabInit: ASSERTION FAILED auFuncs don't point at myldrOpenPath\n"));
-            Int3();
+        }
-        #endif
-        auFuncs[0] = (unsigned)myldrOpenPath_old;
+    }
-#ifdef R3TST
-    R3TstFixImportTab();
-#endif
-    /*
-     * verify proctable
-     */
-    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+    {
-        /* EPT_VARIMPORTs are skipped */
-        if ((aImportTab[i].fType & ~(EPT_BIT_MASK | EPT_NOT_REQ)) == EPT_VARIMPORT)
-            continue;
-        /* EPT_NOT_REQ which is not found are set pointing to the nop function provided. */
-        if (!aImportTab[i].fFound && EPTNotReq(aImportTab[i]))
-            continue;
-        if (EPT32BitEntry(aImportTab[i]))
+        {
-            cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, EPT32Proc(aImportTab[i]));
-            cbmax = OVERLOAD16_ENTRY - 5; /* 5 = Size of the jump instruction */
+        }
-        else
+        {
-            cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, EPT16Proc(aImportTab[i]));
-            cbmax = OVERLOAD16_ENTRY - 5; /* 5 = Size of the jump instruction */
+        }
-        if (cb <= 0 || cb > cbmax)
+        {
-            kprintf(("ImportTabInit: Verify failed for procedure no.%d, cb=%d\n", i, cb));
-            return ERROR_D32_VERIFY_FAILED | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+        }
+    }
-    /*
-     * rehook / import
-     */
-    pchCTEntry = &callTab[0];
-    pchCTEntry16 = &callTab16[0];
-    flWP = x86DisableWriteProtect();
-    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+    {
-        switch (aImportTab[i].fType & ~EPT_WRAPPED)
+        {
-            /*
-             * 32-bit procedure overload.
-             * The overloading procedure is found in the auFuncs table (at the same index
-             *   as the overloaded procedure has in aImportTab).
-             * The overloaded procedure is called by issuing a call to the callTab entry.
-             */
-            case EPT_PROC32:
+            {
-                cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, TRUE);
-                aImportTab[i].cbProlog = (char)cb;
-                if (cb >= 5 && cb + 5 < OVERLOAD32_ENTRY) /* 5(1st): size of jump instruction in the function prolog which jumps to my overloading function */
-                {                                         /* 5(2nd): size of jump instruction which jumps back to the original function after executing the prolog copied to the callTab entry for this function. */
-                    /*
-                     * Copy function prolog which will be overwritten by the jmp to calltabl.
-                     */
-                    memcpy(pchCTEntry, (void*)aImportTab[i].ulAddress, (size_t)cb);
-                    /*
-                     * Make jump instruction which jumps from calltab to original function.
-                     * 0xE9 <four bytes displacement>
-                     * Note: the displacement is relative to the next instruction
-                     */
-                    pchCTEntry[cb] = 0xE9; /* jmp */
-                    *(unsigned long*)(void*)&pchCTEntry[cb+1] = aImportTab[i].ulAddress + cb - (unsigned long)&pchCTEntry[cb+5];
-                    /*
-                     * Jump from original function to my function - an cli(?) could be needed here
-                     */
-                    *(char*)aImportTab[i].ulAddress = 0xE9; /* jmp */
-                    *(unsigned long*)(aImportTab[i].ulAddress + 1) = auFuncs[i] - (aImportTab[i].ulAddress + 5);
+                }
-                else
-                {   /* !fatal! - this could never happen really... */
-                    kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when rehooking it!\n", i));
-                    Int3(); /* ipe - later! */
-                    x86RestoreWriteProtect(flWP);
-                    return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+                }
-                pchCTEntry += OVERLOAD32_ENTRY;
-                break;
+            }
-            /*
-             * 16-bit procedure overload.
-             * Currently disabled due to expected problems when calltab is a 32-bit segment.
-             */
-            case EPT_PROC16:
+            {
-                cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, TRUE);
-                aImportTab[i].cbProlog = (char)cb;
-                if (cb >= 5 && cb + 5 < OVERLOAD16_ENTRY) /* 5:    size of a 16:16 jump which jumps to my overloading function */
-                {                                         /* cb+5: size of a 16:16 jump which is added to the call tab */
-                    /*
-                     * Copy function prolog which is to be overwritten.
-                     */
-                    memcpy(pchCTEntry16, (void*)aImportTab[i].ulAddress, (size_t)cb);
-                    /*
-                     * Create far jump from calltab to original function.
-                     * 0xEA <two byte target address> <two byte target selector>
-                     */
-                    pchCTEntry16[cb] = 0xEA; /* jmp far ptr */
-                    *(unsigned short*)(void*)&pchCTEntry16[cb+1] = (unsigned short)aImportTab[i].offObject + cb;
-                    *(unsigned short*)(void*)&pchCTEntry16[cb+3] = aImportTab[i].usSel;
-                    /*
-                     * We store the far 16:16 pointer to the function in the last four
-                     * bytes of the entry. Set them!
-                     */
-                    *(unsigned short*)(void*)&pchCTEntry16[OVERLOAD16_ENTRY-4] = (unsigned short)aImportTab[i].offObject;
-                    *(unsigned short*)(void*)&pchCTEntry16[OVERLOAD16_ENTRY-2] = aImportTab[i].usSel;
-                    /*
-                     * jump from original function to my function - an cli(?) could be needed here
-                     * 0xEA <two byte target address> <two byte target selector>
-                     */
-                    *(char*)(aImportTab[i].ulAddress) = 0xEA;    /* jmp far ptr */
-                    *(unsigned long*)(aImportTab[i].ulAddress + 1) = auFuncs[i]; /* The auFuncs entry is a far pointer. */
+                }
-                else
-                {   /* !fatal! - this could never happen really... */
-                    kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when rehooking it!\n", i));
-                    Int3(); /* ipe - later! */
-                    x86RestoreWriteProtect(flWP);
-                    return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+                }
-                pchCTEntry16 += OVERLOAD16_ENTRY;
-                break;
+            }
-            /*
-             * 32-bit imported procedure.
-             * This is called by issuing a near call to the callTab entry.
-             */
-            case EPT_PROCIMPORTNR32:     /* Not required */
-                if (!(pchCTEntry[6] = aImportTab[i].fFound))
-                    aImportTab[i].ulAddress = auFuncs[i];
-            case EPT_PROCIMPORT32:
+            {
-                cb = interpretFunctionProlog32((char*)aImportTab[i].ulAddress, FALSE);
-                aImportTab[i].cbProlog = (char)cb;
-                if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */
+                {
-                    /*
-                     * Make jump instruction which jumps from calltab to original function.
-                     * 0xE9 <four bytes displacement>
-                     * Note: the displacement is relative to the next instruction
-                     */
-                    pchCTEntry[0] = 0xE9; /* jmp */
-                    *(unsigned*)(void*)&pchCTEntry[1] = aImportTab[i].ulAddress - (unsigned)&pchCTEntry[5];
+                }
-                else
-                {   /* !fatal! - this should never really happen... */
-                    kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when importing it!\n", i));
-                    Int3(); /* ipe - later! */
-                    x86RestoreWriteProtect(flWP);
-                    return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+                }
-                pchCTEntry += IMPORT32_ENTRY;
-                break;
+            }
-            /*
-             * 16-bit imported procedure.
-             * This is called by issuing a far call to the calltab entry.
-             */
-            case EPT_PROCIMPORTNR16:    /* Not required */
-                if (!(pchCTEntry[7] = aImportTab[i].fFound))
+                {
-                    aImportTab[i].ulAddress = auFuncs[i];
-                    Int3();
-                    break;
+                }
-            case EPT_PROCIMPORT16:
+            {
-                cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, FALSE);
-                aImportTab[i].cbProlog = (char)cb;
-                if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */
+                {
-                    /*
-                     * Create far jump from calltab to original function.
-                     * 0xEA <four byte target address> <two byte target selector>
-                     */
-                    pchCTEntry[0] = 0xEA; /* jmp far ptr */
-                    *(unsigned long*)(void*)&pchCTEntry[1] = aImportTab[i].offObject;
-                    *(unsigned short*)(void*)&pchCTEntry[5] = aImportTab[i].usSel;
+                }
-                else
-                {   /* !fatal! - this should never really happen... */
-                    kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when importing it!\n", i));
-                    Int3(); /* ipe - later! */
-                    x86RestoreWriteProtect(flWP);
-                    return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+                }
-                pchCTEntry += IMPORT16_ENTRY;
-                break;
+            }
-            /*
-             * 16-bit imported hybrid procedure.
-             * This is called by issuing a far call to the 16-bit calltab entry.
-             */
-            case EPT_PROCIMPORTH16:
+            {
-                cb = interpretFunctionProlog16((char*)aImportTab[i].ulAddress, FALSE);
-                aImportTab[i].cbProlog = (char)cb;
-                if (cb > 0) /* Since no prolog part is copied to the function table, it's ok as long as the prolog has been recognzied. */
+                {
-                    /*
-                     * Create far jump from calltab to original function.
-                     * 0xEA <four byte target address> <two byte target selector>
-                     */
-                    pchCTEntry16[0] = 0xEA; /* jmp far ptr */
-                    *(unsigned short*)(void*)&pchCTEntry16[1] = aImportTab[i].offObject;
-                    *(unsigned short*)(void*)&pchCTEntry16[3] = aImportTab[i].usSel;
+                }
-                else
-                {   /* !fatal! - this should never really happen... */
-                    kprintf(("ImportTabInit: FATAL verify failed for procedure no.%d when importing it!\n", i));
-                    Int3(); /* ipe - later! */
-                    x86RestoreWriteProtect(flWP);
-                    return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
+                }
-                pchCTEntry16 += IMPORTH16_ENTRY;
-                break;
+            }
-            /*
-             * 16/32-bit importe variable.
-             * This is used by accessing the 32-bit flat address in the callTab.
-             * callTab-entry + 4 holds the offset of the variable into the object.
-             * callTab-entry + 8 holds the selector for the object. (These two fields is the 16:32-bit pointer to the variable.)
-             * callTab-entry + a holds the 16-bit offset for the variable.
-             * callTab-entry + c holds the selector for the object. (These two fields is the 16:16-bit pointer to the variable.)
-             */
-            case EPT_VARIMPORTNR32:
-            case EPT_VARIMPORTNR16:
-                if (!aImportTab[i].fFound)
+                {
-                    memset(pchCTEntry, 0, VARIMPORT_ENTRY);
-                    pchCTEntry += VARIMPORT_ENTRY;
-                    break;
+                }
-            case EPT_VARIMPORT32:
-            case EPT_VARIMPORT16:
-                aImportTab[i].cbProlog = (char)0;
-                *(unsigned long*)(void*)&pchCTEntry[0] = aImportTab[i].ulAddress;
-                *(unsigned long*)(void*)&pchCTEntry[4] = aImportTab[i].offObject;
-                *(unsigned short*)(void*)&pchCTEntry[8] = aImportTab[i].usSel;
-                *(unsigned short*)(void*)&pchCTEntry[0xa] = (unsigned short)aImportTab[i].offObject;
-                *(unsigned short*)(void*)&pchCTEntry[0xc] = aImportTab[i].usSel;
-                pchCTEntry += VARIMPORT_ENTRY;
-                break;
-            default:
-                kprintf(("ImportTabInit: unsupported type. (procedure no.%d, cb=%d)\n", i, cb));
-                Int3(); /* ipe - later! */
-                x86RestoreWriteProtect(flWP);
-                return ERROR_D32_IPE | (i << ERROR_D32_PROC_SHIFT) | ERROR_D32_PROC_FLAG;
-        } /* switch - type */
-    }   /* for */
-    x86RestoreWriteProtect(flWP);
-    return NO_ERROR;
+}
-#ifdef R3TST
-/**
- * Creates a fake kernel MTE, SMTE and OTE for use while testing in Ring3.
- * @returns Pointer to the fake kernel MTE.
- * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- */
-PMTE GetOS2KrnlMTETst(void)
+{
-    static MTE    KrnlMTE;
-    static SMTE   KrnlSMTE;
-    KrnlMTE.mte_swapmte = &KrnlSMTE;
-    KrnlSMTE.smte_objtab = &aKrnlOTE[0];
-    KrnlSMTE.smte_objcnt = cObjectsFake;
-    return &KrnlMTE;
+}
-/**
- * -Ring-3 testing-
- * Changes the entries in aImportTab to point to their fake equivalents.
- * @returns void
- * @param   void
- * @status  completely implemented.
- * @author  knut st. osmundsen (knut.stange.osmundsen@mynd.no)
- * @remark  Called before the aImportTab array is used/verified.
- */
-VOID R3TstFixImportTab(VOID)
+{
-    int i;
-    for (i = 0; i < NBR_OF_KRNLIMPORTS; i++)
+    {
-        switch (aImportTab[i].fType & ~EPT_NOT_REQ)
+        {
-            case EPT_PROC32:
-                if (aTstFakers[i].fObj != 1)
-                    kprintf(("R3TstFixImportTab: invalid segment config for entry %i. (PROC32)\n", i));
-                break;
-            case EPT_PROCIMPORT32:
-                if (aTstFakers[i].fObj != 1)
-                    kprintf(("R3TstFixImportTab: invalid segment config for entry %i. (PROCIMPORT32)\n", i));
-                break;
-            case EPT_PROCIMPORT16:
-                if (aTstFakers[i].fObj != 2)
-                    kprintf(("R3TstFixImportTab: invalid segment config for entry %i. (PROCIMPORT16)\n", i));
-                break;
-            case EPT_VARIMPORT32:
-            case EPT_VARIMPORT16:
-                if (aTstFakers[i].fObj != 3 && aTstFakers[i].fObj != 4)
-                    kprintf(("R3TstFixImportTab: invalid segment config for entry %i. (VARIMPORT32/16)\n", i));
-                break;
-        } /* switch - type */
-        aImportTab[i].ulAddress = aTstFakers[i].uAddress;
-        switch (aTstFakers[i].fObj)
+        {
-            case 1:
-                aImportTab[i].usSel = GetSelectorCODE32();
-                aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE32START;
-                break;
-            case 2:
-                aImportTab[i].usSel = GetSelectorCODE16();
-                aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&CODE16START;
-                break;
-            case 3:
-                aImportTab[i].usSel = GetSelectorDATA32();
-                aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA32START;
-                break;
-            case 4:
-                aImportTab[i].usSel = GetSelectorDATA16();
-                aImportTab[i].offObject = aTstFakers[i].uAddress - (unsigned)&DATA16START;
-                break;
-            default:
-                kprintf(("R3TstFixImportTab: invalid segment config for entry %i.\n", i));
+        }
-    } /* for */
+}
-#endif
-/**
- * Dummy nop function if SecPathFromSFN isn't found.
- */
-PSZ SECCALL nopSecPathFromSFN(SFN hFile)
+{
-    NOREF(hFile);
-    return NULL;
+}

branches/splittup/src/win32k/dev32/devfirst.asm

-              r6280
+              r6841
 ; $Id: devfirst.asm,v 1.9 2001-07-10 05:19:34 bird Exp $
+; $Id: devfirst.asm,v 1.9.2.1 2001-09-27 03:08:14 bird Exp $
+;
 ; DevFirst - entrypoint and segment definitions
 …
     public EH_DATASTART
+    public _strategyAsm0
+    public _strategyAsm1
+    public _CallGetKernelInfo32
+    public _CallElfIOCtl
+    public _strategyAsm
     public _CallWin32kIOCtl
     public _CallWin32kOpen
     public _CallWin32kClose
     public _SSToDS_16a
-    public GetOS2KrnlMTE
-    public x86DisableWriteProtect
-    public x86RestoreWriteProtect
 …
 ; Externs
+;
+    extrn _TKSSBase16:dword
+    extrn GETKERNELINFO32:FAR
+    extrn ELFIOCTL:FAR
+    extrn _TKSSBase:dword
     extrn WIN32KIOCTL:FAR
     extrn WIN32KOPEN:FAR
 …
     ASSUME CS:CODE16, DS:DATA16, ES:NOTHING, SS:NOTHING
+CODE16START label byte
+CODE16START db 'CODE16START',0
     .286p
-;$win32ki entry point
-_strategyAsm0:
-;    int 3
-    push    0
-    jmp     _strategyAsm
-;$win32k entry point
-_strategyAsm1:
-;    int 3
-    push    1
-    jmp     _strategyAsm
 ;;
 ; Stub which pushes parameters onto the stack and call the 16-bit C strategy routine.
 …
     .386p
 ;;
-; Thunk procedure for R0Init32.
-; @cproto    USHORT NEAR CallGetKernelInfo32(ULONG addressKrnlInfoBuf);
-; @returns   Same as GetKernelInfo32.
-; @param     addressKrnlInfoBuf  32-bit pointer to request data on stack.
-; @status    completely implemented.
-; @author    knut st. osmundsen
-_CallGetKernelInfo32 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:GETKERNELINFO32
-    pop     ds
-    ret
-_CallGetKernelInfo32 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);
 …
 ;;
 ; SSToDS - stack pointer to Flat pointer.
 …
 _SSToDS_16a proc NEAR
     assume CS:CODE16, DS:DATA16, ES:NOTHING
-    mov     edx, ds:_TKSSBase16         ; get pointer held by _TKSSBase16 (pointer to stack base)
     call    far ptr FLAT:far_getCS      ; get flat selector.
     push    es
     mov     es,  ax
     assume  es:FLAT
     mov     eax, es:[edx]               ; get pointer to stack base
+    mov     eax, es:_TKSSBase           ; get pointer to stack base
     pop     es
     movzx   edx, word ptr ss:[esp + 2]  ; 16-bit stack pointer (parameter)
 …
     ret
 GetOS2KrnlMTE ENDP
-;;
-; Disables the ring-0 write protection.
-; It's used to help us write to readonly code segments and objects.
-; @cproto   extern ULONG    _Optlink x86DisableWriteProtect(void);
-; @return   Previous write protection flag setting.
-; @uses     eax, edx
-; @status   completely implemented.
-; @author   knut st. osmundsen (knut.stange.osmundsen@mynd.no)
-; @remark   Used by importTabInit.
-x86DisableWriteProtect proc near
-    cli
-    mov     edx, cr0                    ; Get current cr0
-    test    edx, 000010000h             ; Test for the WriteProtect flag (bit 16)
-    setnz   al
-    movzx   eax, al                     ; Old flag setting in eax (return value)
-    and     edx, 0fffeffffh             ; Clear the 16th (WP) bit.
-    mov     cr0, edx                    ;
-    sti
-    ret                                 ; return eax holds previous WP value.
-x86DisableWriteProtect endp
-;;
-; Restore the WP flag of CR0 to it's previous state.
-; The call is intent only to be called with the result from x86DisableWriteProtect,
-; and will hence only enable the WP flag.
-; @cproto   extern ULONG    _Optlink x86RestoreWriteProtect(ULONG flWP);
-; @return   Previous write protection flag setting.
-; @param    eax - flWP  Boolean value. (1 = WP was set, 0 WP was clear)
-; @uses     eax
-; @status   completely implemented.
-; @author   knut st. osmundsen (knut.stange.osmundsen@mynd.no)
-; @remark   Used by importTabInit.
-x86RestoreWriteProtect proc near
-    test    eax, eax                    ; Check if the flag was previously clear
-    jnz     x86RWP_set                  ; If set Then Set it back.
-    jmp     x86RWP_end                  ; If clear Then nothing to do.
-x86RWP_set:
-    cli
-    mov     eax, cr0                    ; Get current cr0.
-    or      eax, 000010000h             ; The the 16-bit (WP) bit.
-    mov     cr0, eax                    ; Update cr0.
-    sti
-x86RWP_end:
-    ret
-x86RestoreWriteProtect endp
 …
 CODE16_INIT segment
 CODE16_INITSTART label byte
+CODE16_INITSTART db 'CODE16_INITSTART',0
 CODE16_INIT ends
 DATA16 segment
 DATA16START label byte
+DATA16START label byte ; no string here!!
 DATA16 ends
 DATA16_BSS segment
 DATA16_BSSSTART label byte
+DATA16_BSSSTART db 'DATA16_BSSSTART',0
 DATA16_BSS ends
 DATA16_CONST segment
 DATA16_CONSTSTART label byte
+DATA16_CONSTSTART db 'DATA16_CONSTSTART', 0
 DATA16_CONST ends
 DATA16_INIT segment
 DATA16_INITSTART label byte
+DATA16_INITSTART db 'DATA16_INITSTART',0
 DATA16_INIT ends
 DATA32 segment
 DATA32START label byte
+DATA32START db 'DATA32START',0
 DATA32 ends
 BSS32 segment
 BSS32START label byte
+BSS32START db 'BSS32START',0
 BSS32 ends
 CONST32_RO segment
 CONST32_ROSTART label byte
+CONST32_ROSTART db 'CONST32_ROSTART',0
 CONST32_RO ends
 _VFT segment
 _VFTSTART LABEL BYTE
+_VFTSTART db '_VFTSTART',0
 _VFT ends
 EH_DATA segment
 EH_DATASTART LABEL BYTE
+EH_DATASTART db 'EH_DATASTART',0
 EH_DATA ends

branches/splittup/src/win32k/dev32/devlast.asm

-              r4164
+              r6841
 ; $Id: devlast.asm,v 1.6 2000-09-02 21:07:58 bird Exp $
+; $Id: devlast.asm,v 1.6.2.1 2001-09-27 03:08:15 bird Exp $
+;
 ; DevLast - the object file termintating the resident part of the objects.
 …
 ; after this file is discarded after init.
+;
 ; Copyright (c) 1999 knut st. osmundsen
+; Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+;
 ; Project Odin Software License can be found in LICENSE.TXT
 …
     public EH_DATAEND
+    public _CallR0Init32
+    public _CallVerifyImportTab32
+    public _GetR0InitPtr
+;
+;   External Functions
+;
+    extrn R0Init:PROC
+;
 …
+;
 DATA16 segment
+DATA16END db ?
+db 'DATA16END'
+DATA16END db 0
 DATA16 ends
 DATA16_BSS segment
+DATA16_BSSEND db ?
+db 'DATA16_BSSEND'
+DATA16_BSSEND db 0
 DATA16_BSS ends
 DATA16_CONST segment
+DATA16_CONSTEND db ?
+db 'DATA16_CONSTEND'
+DATA16_CONSTEND db 0
 DATA16_CONST ends
 DATA16_INIT segment
+DATA16_INITEND db ?
+db 'DATA16_INITEND'
+DATA16_INITEND db 0
 DATA16_INIT ends
 DATA16_INIT_BSS segment
+DATA16_INIT_BSSEND db ?
+db 'DATA16_INIT_BSSEND'
+DATA16_INIT_BSSEND db 0
 DATA16_INIT_BSS ends
 DATA16_INIT_CONST segment
+DATA16_INIT_CONSTEND db ?
+db 'DATA16_INIT_CONSTEND'
+DATA16_INIT_CONSTEND db 0
 DATA16_INIT_CONST ends
 CODE16 segment
+CODE16END db ?
+db 'CODE16END'
+CODE16END db 0
 CODE16 ends
-extrn R0INIT32:FAR
-extrn VERIFYIMPORTTAB32:FAR
 CODE16_INIT segment
 ;;
+; Thunk procedure for R0Init32.
+; @cproto    USHORT NEAR CallR0Init32(LIN pRpInit);
+; @returns   Same as R0Init32.
+; @param     pRpInit  32-bit pointer to request packet.
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallR0Init32 PROC NEAR
+    ASSUME CS:CODE16_INIT
+    push    ds
+    push    word ptr [esp+6]            ; push high word.
+    push    word ptr [esp+6]            ; push low word.
+    call    far ptr FLAT:R0INIT32
+    pop     ds
+; Gets the 32-bit flat pointer of R0Init. (32-bit init function)
+; @cproto   ULONG GetR0InitPtr(void);
+; @returns  Flat pointer to R0Init. (ax:dx)
+; @uses     uses eax, edx.
+; @author   knut st. osmundsen (kosmunds@csc.com)
+_GetR0InitPtr PROC NEAR
+    assume ds:nothing, ss:nothing, es:nothing
+    mov     eax, offset FLAT:CODE32:R0Init
+    mov     edx, eax
+    shr     edx, 16
     ret
 _CallR0Init32 ENDP
+_GetR0InitPtr ENDP
+;;
+; Thunk procedure for VerifyImportTab32.
+; @cproto    USHORT NEAR CallVerifyImportTab32(void);
+; @returns   Same as VerifyImportTab32.
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallVerifyImportTab32 PROC NEAR
+    ASSUME CS:CODE16_INIT
+    push    ds
+    call    far ptr FLAT:VERIFYIMPORTTAB32
+    pop     ds
+    ret
+_CallVerifyImportTab32 ENDP
+CODE16_INITEND LABEL BYTE
+db 'CODE16_INITEND'
+CODE16_INITEND db 0
 CODE16_INIT ends
 CODE32 segment
+CODE32END LABEL BYTE
+db 'CODE32END'
+CODE32END db 0
 CODE32 ends
 DATA32 segment
+DATA32END  LABEL BYTE
+db 'DATA32END'
+DATA32END  db 0
 DATA32 ends
 BSS32 segment
+BSS32END  LABEL BYTE
+db 'BSS32END'
+BSS32END  db 0
 BSS32 ends
 CONST32_RO segment
+CONST32_ROEND LABEL BYTE
+db 'CONST32_ROEND'
+CONST32_ROEND db 0
 CONST32_RO ends
 _VFT segment
+_VFTEND LABEL BYTE
+db '_VFTEND'
+_VFTEND db 0
 _VFT ends
 EH_DATA segment
+EH_DATAEND LABEL BYTE
+db 'EH_DATAEND'
+EH_DATAEND db 0
 EH_DATA ends

branches/splittup/src/win32k/include/PerTaskW32kData.h

-              r6296
+              r6841
 /* $Id: PerTaskW32kData.h,v 1.2 2001-07-10 16:41:10 bird Exp $
+/* $Id: PerTaskW32kData.h,v 1.2.2.1 2001-09-27 03:08:17 bird Exp $
+ *
  * Per Task (Win32k) Data.
 …
 typedef struct _PerTaskData
+{
     AVLNODECORE     core;
+    AVLPVNODECORE   core;
     ULONG           cUsage;             /* Usage counter. */
     PPTDA           pPTDA;              /* Also in core.Key */

branches/splittup/src/win32k/include/dev16.h

-              r6227
+              r6841
 /* $Id: dev16.h,v 1.11 2001-07-08 03:05:28 bird Exp $
+/* $Id: dev16.h,v 1.11.2.1 2001-09-27 03:08:17 bird Exp $
  * dev16 - 16-bit specific. Should not be used in 32-bit C/C++.
+ *
  * Copyright (c) 1999 knut st. osmundsen
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #endif
-/*
- * Ring 0 init IOCtl (dev1 -> dev0)
- */
-#define D16_IOCTL_CAT               0xC0
-#define D16_IOCTL_RING0INIT         0x40
-typedef struct _D16R0INITDATA
+{
-    USHORT usRcInit32;
-} D16R0INITDATA;
-typedef D16R0INITDATA FAR *PD16R0INITDATA;
-typedef struct _D16R0INITPARAM
+{
-    PRPINITIN pRpInitIn;
-} D16R0INITPARAM;
-typedef D16R0INITPARAM FAR *PD16R0INITPARAM;
-/*
- * Get Kernel OTEs. No params. Data is KRNLOBJTABLE (dev1632.h).
- */
-#define D16_IOCTL_GETKRNLINFO       0x41
-/*
- * Verify aImportTab. No params. No data (aImportTab is used).
- */
-#define D16_IOCTL_VERIFYIMPORTTAB   0x42
-typedef struct _D16VERIFYIMPORTTABDATA
+{
-    USHORT usRc;
-} D16VERIFYIMPORTTABDATA;
-typedef D16VERIFYIMPORTTABDATA FAR *PD16VERIFYIMPORTTABDATA;
-/**
- * Regards goes to Matthieu Willm for (parts of) this!
- */
-#ifdef INCL_16
-    typedef void FAR * FPVOID;
-#else
-    typedef ULONG FPVOID;
-#endif
-typedef struct _DosTable /* dt */
+{
-    UCHAR  cul;             /* count of entries (dwords) in this table.*/
-    FPVOID fph_HardError;
-    FPVOID fph_UCase;
-    ULONG  UnknownOrReserved1;
-    ULONG  UnknownOrReserved2;
-    ULONG  UnknownOrReserved3;
-    FPVOID fph_MemMapAlias;
-    FPVOID fph_MemUnmapAlias;
-    FPVOID fph_GoProtAll;
-    FPVOID fph_GoRealAll;
-    FPVOID fph_doshlp_RedirDev;
-    ULONG  UnknownOrReserved4;
-    ULONG  UnknownOrReserved5;
-    FPVOID fph_SFFromSFN;
-    FPVOID fph_SegGetInfo;
-    FPVOID fph_AsgCheckDrive;
-    ULONG  UnknownOrReserved6;
-    ULONG  UnknownOrReserved7;
-} DOSTABLE, FAR *PDOSTABLE , NEAR *NPDOSTABLE;
-typedef struct _DosTable2 /* dt2 */
+{
-    UCHAR  cul;             /* count of entries (dwords) in this table.*/
-    FPVOID fpErrMap24;
-    FPVOID fpErrMap24End;
-    FPVOID fpErr_Table_24;
-    FPVOID fpCDSAddr;
-    FPVOID fpGDT_RDR1;
-    FPVOID fpInterrupLevel;
-    FPVOID fp_cInDos;
-    ULONG  UnknownOrReserved1;
-    ULONG  UnknownOrReserved2;
-    ULONG  R0FlatCS;
-    ULONG  R0FlatDS;
-    LIN    pTKSSBase;
-    LIN    pintSwitchStack;
-    LIN    pprivatStack;
-    FPVOID fpPhysDiskTablePtr;
-    LIN    pforceEMHandler;
-    LIN    pReserveVM;
-    LIN    p_pgpPageDir;
-    ULONG  UnknownOrReserved3;
-} DOSTABLE2, FAR *PDOSTABLE2 , NEAR *NPDOSTABLE2;
 /*
  * init functions
  */
+USHORT NEAR dev0Init(PRPINITIN pRpIn, PRPINITOUT pRpOut);
+USHORT NEAR dev1Init(PRPINITIN pRpIn, PRPINITOUT pRpOut);
+USHORT NEAR R0Init16(PRP_GENIOCTL pRp);
+USHORT NEAR initGetDosTableData(void);
+#if 0 /*ndef CODE16_INIT*/
+#pragma alloc_text(CODE16_INIT, dev0Init, dev1Init, R0Init16, initGetDosTableData)
+#endif
+USHORT NEAR devInit(PRPINITIN pRpIn, PRPINITOUT pRpOut);
 /*
 …
  */
 USHORT NEAR CallR0Init32(LIN pRpInit);
-USHORT NEAR CallGetKernelInfo32(ULONG addressKrnlInfoBuf);
-USHORT NEAR CallVerifyImportTab32(void);
-USHORT NEAR CallElfIOCtl(LIN pRpIOCtl);
 USHORT NEAR CallWin32kIOCtl(LIN pRpIOCtl);
 USHORT NEAR CallWin32kOpen(LIN pRpOpen);
 USHORT NEAR CallWin32kClose(LIN pRpClose);
+#if 0 /*ndef CODE16_INIT*/
+#pragma alloc_text(CODE16_INIT, CallR0Init32, CallVerifyImportTab32, CallGetKernelInfo32)
+#endif
+ULONG  NEAR GetR0InitPtr(void);
 …
  * These are only for use in the 'aDevHdrs'.
  */
+extern void NEAR strategyAsm0(void);
+extern void NEAR strategyAsm1(void);
+extern void NEAR strategyAsm(void);
 /*
  * Global data.
  */
 extern DDHDR    aDevHdrs[2];
+extern DDHDR    aDevHdrs[1];
 extern PFN      Device_Help;
-extern ULONG    TKSSBase16;
-extern USHORT   R0FlatCS16;
-extern USHORT   R0FlatDS16;
 extern BOOL     fInitTime;
 …
  * Stack to Flat DS - 16-bit version.
  */
-/*#define SSToDS_16(pStackVar) ((LIN)(getTKSSBaseValue() + (ULONG)(USHORT)(pStackVar)))*/
 #define SSToDS_16(pStackVar) (SSToDS_16a((void NEAR *)pStackVar))

branches/splittup/src/win32k/include/dev1632.h

-              r6226
+              r6841
 /* $Id: dev1632.h,v 1.8 2001-07-08 03:03:51 bird Exp $
+/* $Id: dev1632.h,v 1.8.2.1 2001-09-27 03:08:17 bird Exp $
  * dev1632.h - Common header file for 16-bit and 32-bit C
+ *
 …
 } RP32OPENCLOSE, *PRP32OPENCLOSE;
-#ifdef _OS2KLDR_H_
-#define MAXKRNLOBJECTS 24
-typedef struct _KRNLINFO
+{
-    unsigned long   ulBuild;
-    unsigned short  fKernel;
-    unsigned char   cObjects;
-    unsigned char   chPadding;
-    OTE             aObjects[MAXKRNLOBJECTS];
-} KRNLINFO, FAR * PKRNLINFO;
-#else
-#define PKRNLINFO void *
-#endif
 #pragma pack()

branches/splittup/src/win32k/include/dev32.h

-              r6225
+              r6841
 /* $Id: dev32.h,v 1.12 2001-07-08 03:03:14 bird Exp $
+/* $Id: dev32.h,v 1.12.2.1 2001-09-27 03:08:18 bird Exp $
+ *
  * dev32 - header file for 32-bit part of the driver.
 …
 #if !defined(__cplusplus) && defined(RING0)
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit);
-USHORT _loadds _Far32 _Pascal GetKernelInfo32(PKRNLINFO pKrnlInfo);
-USHORT _loadds _Far32 _Pascal VerifyImportTab32(void);
-USHORT _loadds _Far32 _Pascal ElfIOCtl(PRP32GENIOCTL pRpIOCtl);
 USHORT _loadds _Far32 _Pascal Win32kIOCtl(PRP32GENIOCTL pRpIOCtl);
 USHORT _loadds _Far32 _Pascal Win32kOpen(PRP32OPENCLOSE pRpOpen);
 USHORT _loadds _Far32 _Pascal Win32kClose(PRP32OPENCLOSE pRpClose);
 #endif
-#ifdef _OS2KLDR_H_
-PMTE _System GetOS2KrnlMTE(void); /* (devfirst.asm) */
-#endif
 ULONG  _Optlink InitCallGate(void);
-ULONG  _Optlink x86DisableWriteProtect(void);
-ULONG  _Optlink x86RestoreWriteProtect(ULONG flWP);
 …
  * Global variables
  */
-extern PULONG pulTKSSBase32;
 extern USHORT CallGateGDT;
 …
  * @returns    32-bit FLAT pointer.
  */
+#ifdef RING0
+    #define SSToDS(a)   ((PVOID)((ULONG)(a) + *pulTKSSBase32))
+#else
+    #define SSToDS(a)   ((PVOID)(a))
+#ifndef SSToDS
+    #ifdef RING0
+        #define SSToDS(a)   ((PVOID)((ULONG)(a) + TKSSBase))
+    #else
+        #define SSToDS(a)   ((PVOID)(a))
+    #endif
 #endif

branches/splittup/src/win32k/include/ldr.h

-              r4785
+              r6841
 /* $Id: ldr.h,v 1.7 2000-12-11 06:44:35 bird Exp $
+/* $Id: ldr.h,v 1.7.2.1 2001-09-27 03:08:18 bird Exp $
+ *
  * ldr - Our loader "subsystem" public header file.
 …
  * Fail if dependent header files is missing
  */
 #ifndef _AVL_H_
 #error "You'll have to include avl.h before ldr.h!"
+#ifndef _kAVL_h_
+#error "You'll have to include kKrnlLib.h with INCL_KKL_AVL before ldr.h!"
 #endif
 …
 typedef struct _Module
+{
     AVLNODECORE     coreKey;    /* Key is hFile. */
     AVLNODECORE     coreMTE;    /* Key is pMTE. */
+    AVLULNODECORE   coreKey;    /* Key is hFile. */
+    AVLULNODECORE   coreMTE;    /* Key is pMTE. */
     SFN             hFile;      /* System file number or file handle if you prefer that. */
 …
 ULONG       ldrInit(void);
+/*
+ * Overriding functions.
+ */
+extern ULONG LDRCALL myldrOpen(PSFN phFile, PSZ pszFilename, PULONG pfl);
 #ifdef __cplusplus
+}

branches/splittup/src/win32k/include/options.h

-              r6003
+              r6841
 /* $Id: options.h,v 1.22 2001-06-14 01:06:47 bird Exp $
+/* $Id: options.h,v 1.22.2.1 2001-09-27 03:08:19 bird Exp $
+ *
  * Options.
 …
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-/* fKernel */
-#define KF_UNI              0x0000
-#define KF_SMP              0x0001
-#define KF_W4               0x0002
-#define KF_REV_MASK         0x0FF0
-#define KF_REV_SHIFT        4
-#define KF_REV_0            0x0000
-#define KF_REV_A            0x0010
-#define KF_REV_B            0x0020
-#define KF_REV_C            0x0030
-#define KF_REV_D            0x0040
-#define KF_REV_E            0x0050
-#define KF_REV_F            0x0060
-#define KF_REV_G            0x0070
-#define KF_REV_H            0x0080
-#define KF_REV_I            0x0090
-#define KF_REV_J            0x00a0
-#define KF_REV_K            0x00b0
-#define KF_REV_L            0x00c0
-#define KF_REV_M            0x00d0
-#define KF_REV_N            0x00e0
-#define KF_REV_O            0x00f0
-#define KF_REV_P            0x0100
-#define KF_REV_Q            0x0110
-#define KF_REV_R            0x0120
-#define KF_REV_S            0x0130
-#define KF_REV_T            0x0140
-#define KF_REV_U            0x0150
-#define KF_REV_V            0x0160
-#define KF_REV_W            0x0170
-#define KF_REV_X            0x0180
-#define KF_REV_Y            0x0190
-#define KF_REV_Z            0x01a0
-#define KF_REV_ECS          0x0900
-#define KF_DEBUG            0x1000
-#define KF_HAS_DEBUGTYPE    0x2000
-#define KF_ALLSTRICT        0x3000
-#define KF_HALFSTRICT       0x7000
 /* fPE */
 #define FLAGS_PE_NOT        0x00000000UL
 …
 #define INFOLEVEL_INFOALL   0x00000004UL
-/* default heapsizes */
-#define CB_SWP_INIT         ((unsigned long)1024*512)      /* 512KB */
-#define CB_SWP_MAX          ((unsigned long)1024*1024*16)  /*  16MB  */
-#define CB_RES_INIT         ((unsigned long)1024*256)      /* 256KB */
-#define CB_RES_MAX          ((unsigned long)1024*1024*10)  /*  10MB  */
 /* NOINC */
 /* default assignments */
 #define DEFAULT_OPTION_ASSIGMENTS                           \
             {FALSE,                 /* fQuiet        */     \
-            OUTPUT_COM2,            /* usCom         */     \
             FALSE,                  /* fLogging      */     \
-            KF_UNI,                 /* fKernel       */     \
-            ~0UL,                   /* ulBuild       */     \
-            (unsigned short)~0,     /* usVerMajor    */     \
-            (unsigned short)~0,     /* usVerMinor    */     \
             FLAGS_PE_PE,            /* fPE           */     \
             FLAGS_PEOO_FORCED,      /* fPEOneObject  */     \
 …
             TRUE,                   /* fExeFixes     */     \
             FALSE,                  /* fForcePreload */     \
+            FALSE,                  /* fApiEnh       */     \
+            CB_SWP_INIT,            /* cbSwpHeapInit */     \
+            CB_SWP_MAX,             /* cbSwpHeapMax  */     \
+            CB_RES_INIT,            /* cbResHeapInit */     \
+            CB_RES_MAX}             /* cbResHeapMax  */
+            FALSE                   /* fApiEnh       */     \
+            }
 #define isAnyLoaderEnabled()        (!options.fNoLoader && \
 …
 #define isJAVAEnabled()             (options.fJava)
-#define isSMPKernel()               (options.fKernel & KF_SMP)
-#define isUNIKernel()               (!(options.fKernel & KF_SMP))
-#define isHighMemorySupported()     (options.ulBuild >= 14000 || isSMPKernel())
 #define isDllFixesEnabled()         (options.fDllFixes)
 #define isDllFixesDisabled()        (!options.fDllFixes)
 …
 /** Option struct */
 #pragma pack(4)
 struct options
+struct Win32kOptions
+{
     /** @cat misc */
 …
     /** @cat logging options */
-    USHORT      usCom;                  /* Output port no. */
     USHORT      fLogging;               /* Logging. */
-    /** @cat kernel selection */
-    ULONG       fKernel;                /* Smp or uni kernel. */
-    ULONG       ulBuild;                /* Kernel build. */
-    USHORT      usVerMajor;             /* OS/2 major ver - 20 */
-    USHORT      usVerMinor;             /* OS/2 minor ver - 30,40 */
     /** @cat Options affecting the generated LX executables */
 …
     ULONG       fForcePreload;          /* Forces the loader to preload executable images. Handy for ICAT Ring-3 debugging. */
     ULONG       fApiEnh;                /* Enables the API enhancements */
-    /** @cat Options affecting the heap. */
-    ULONG       cbSwpHeapInit;          /* Initial heapsize. */
-    ULONG       cbSwpHeapMax;           /* Maximum heapsize. */
-    ULONG       cbResHeapInit;          /* Initial residentheapsize. */
-    ULONG       cbResHeapMax;           /* Maxiumem residentheapsize. */
 };
 #pragma pack()
 …
 *******************************************************************************/
 /* NOINC */
 extern struct options DATA16_GLOBAL options;    /* defined in d16globals.c */
+extern struct Win32kOptions DATA16_GLOBAL options;    /* defined in d16globals.c */
 extern char   szWin32kIni[160];                 /* defined in d16globals.c */
 #ifdef RING0

branches/splittup/src/win32k/include/test.h

-              r6285
+              r6841
 /* $Id: test.h,v 1.10 2001-07-10 05:24:18 bird Exp $
+/* $Id: test.h,v 1.10.2.1 2001-09-27 03:08:20 bird Exp $
+ *
  * Definitions and declarations for test moduls.
 …
 ULONG KRNLCALL  fakeTKSuFuBuff(PVOID pvUsr, PVOID pv, ULONG cb, ULONG fl);
 ULONG KRNLCALL  fakeTKPidToPTDA(PID pid, PPPTDA ppPTDA);
+ULONG KRNLCALL  fakeTKScanTasks(ULONG flFlags, ULONG id, PTKSCANTASKWORKER pfnWorker, ULONG ulArg);
 void KRNLCALL   fakeTKForceThread(ULONG flFlag, PTCB pTCB);
 void KRNLCALL   fakeTKForceTask(ULONG flFlag, PPTDA pPTDA, BOOL fForce);

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

-              r5179
+              r6841
 /* $Id: k32AllocMemEx.cpp,v 1.5 2001-02-19 05:49:05 bird Exp $
+/* $Id: k32AllocMemEx.cpp,v 1.5.2.1 2001-09-27 03:08:21 bird Exp $
+ *
  * k32AllocMemEx - Equivalent to DosAllocMem, but this one
 …
 #define INCL_OS2KRNL_VM
 #define INCL_OS2KRNL_TK
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"
-#include "macros.h"
 …
         if (    vmac.ac_va < 0x10000
             ||  vmac.ac_va + cb < vmac.ac_va
             ||  vmac.ac_va + cb > ((vmac.ac_va >= 0x20000000 && pahvmhShr) ? pahvmhShr : pahvmShr)->ah_laddrMax
+            ||  vmac.ac_va + cb > ((vmac.ac_va >= 0x20000000 && &ahvmhShr) ? ahvmhShr.ah_laddrMax : ahvmShr.ah_laddrMax)
+                )
+        {
 …
     flVMFlags =  VMA_USER | VMA_ZEROFILL | VMA_LOWMEM2 | VMA_ARENAPRIVATE /* 0x02010084*/
         | ((flFlags & OBJ_ANY) && pahvmhShr ? VMA_ARENAHIGHA : VMA_SELALLOC | VMA_ALIGNSEL)
+        | ((flFlags & OBJ_ANY) && &ahvmhShr ? VMA_ARENAHIGHA : VMA_SELALLOC | VMA_ALIGNSEL)
         | vmApiF0[flFlags  & (PAG_READ | PAG_WRITE | PAG_EXECUTE | PAG_GUARD)]
         | vmApiF1[(flFlags & (PAG_COMMIT | PAG_DECOMMIT | OBJ_TILE | OBJ_PROTECTED)) >> 4];

branches/splittup/src/win32k/k32/k32HandleSystemEvent.cpp

-              r5169
+              r6841
 /* $Id: k32HandleSystemEvent.cpp,v 1.1 2001-02-18 15:26:38 bird Exp $
+/* $Id: k32HandleSystemEvent.cpp,v 1.1.2.1 2001-09-27 03:08:22 bird Exp $
+ *
  * k32HandleSystemEvent - Override system events like Ctrl-Alt-Delete
 …
 #define INCL_OS2KRNL_TK
 #define INCL_OS2KRNL_SEM
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"

branches/splittup/src/win32k/k32/k32KillProcessEx.cpp

-              r6286
+              r6841
 /* $Id: k32KillProcessEx.cpp,v 1.1 2001-07-10 05:20:59 bird Exp $
+/* $Id: k32KillProcessEx.cpp,v 1.1.2.1 2001-09-27 03:08:22 bird Exp $
+ *
  * k32KillProcessEx - DosKillProcessEx extention.
 …
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"
-#include "macros.h"

branches/splittup/src/win32k/k32/k32ProcessReadWrite.cpp

-              r5086
+              r6841
 /* $Id: k32ProcessReadWrite.cpp,v 1.2 2001-02-10 11:11:44 bird Exp $
+/* $Id: k32ProcessReadWrite.cpp,v 1.2.2.1 2001-09-27 03:08:22 bird Exp $
+ *
  * k32ProcessReadWrite  -  Read or write to another process.
 …
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"

branches/splittup/src/win32k/k32/k32QueryCallGate.cpp

-              r5250
+              r6841
 /* $Id: k32QueryCallGate.cpp,v 1.3 2001-02-23 04:01:48 bird Exp $
+/* $Id: k32QueryCallGate.cpp,v 1.3.2.1 2001-09-27 03:08:22 bird Exp $
+ *
  * k32QueryCallGate - Query the callgate selector for the callgate to the k32 APIs.
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"
-#include "macros.h"

branches/splittup/src/win32k/k32/k32QueryOTEs.cpp

-              r5086
+              r6841
 /* $Id: k32QueryOTEs.cpp,v 1.3 2001-02-10 11:11:44 bird Exp $
+/* $Id: k32QueryOTEs.cpp,v 1.3.2.1 2001-09-27 03:08:22 bird Exp $
+ *
  * k32QueryOTEs  -  Get's the object table entries (OTEs) for a given
 …
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 #include "options.h"
 #include "dev32.h"
-#include "log.h"

branches/splittup/src/win32k/k32/k32QueryOptionsStatus.cpp

-              r5118
+              r6841
 /* $Id: k32QueryOptionsStatus.cpp,v 1.7 2001-02-11 23:43:00 bird Exp $
+/* $Id: k32QueryOptionsStatus.cpp,v 1.7.2.1 2001-09-27 03:08:23 bird Exp $
+ *
  * k32QueryOptionsStatus  - Queries the options and/or the status of
 …
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
+#define INCL_KKL_HEAP
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 #include <newexe.h>                     /* OS/2 NE structs and definitions. */
 #include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
 #include <string.h>                     /* C library string.h. */
 …
 #include <stdarg.h>                     /* C library stdarg.h. */
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev1632.h"                    /* Common 16- and 32-bit parts */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
-#include "log.h"                        /* Logging. */
-#include "avl.h"                        /* AVL tree. (ldr.h need it) */
 #include "ldr.h"                        /* ldr helpers. (ldrGetExePath) */
 #include "env.h"                        /* Environment helpers. */
+#include "env.h" //todo                       /* Environment helpers. */
 #include "modulebase.h"                 /* ModuleBase class definitions, ++. */
 #include "pe2lx.h"                      /* Pe2Lx class definitions, ++. */
 …
 #include "options.h"                    /* Win32k options. */
-#include "ProbKrnl.h"                   /* ProbKrnl variables and definitions. */
 #include "win32k.h"                     /* Win32k API structures.  */
 #include "k32.h"                        /* Internal Win32k API structures.  */
 …
         TmpOptions.cb           = sizeof(K32OPTIONS);
+        #if 0
         TmpOptions.usCom        = options.usCom;
+        #endif
         TmpOptions.fLogging     = options.fLogging;
         TmpOptions.fPE          = options.fPE;
 …
         TmpOptions.fForcePreload= options.fForcePreload;
         TmpOptions.fApiEnh      = options.fApiEnh;
+        #if 0
         TmpOptions.cbSwpHeapMax = options.cbSwpHeapMax;
         TmpOptions.cbResHeapMax = options.cbResHeapMax;
+        #endif
         rc = TKSuBuff(pOptions, SSToDS(&TmpOptions), sizeof(K32OPTIONS), TK_FUSU_NONFATAL);
 …
         /* options */
         TmpStatus.fQuiet            = options.fQuiet;
+        #if 0 //todo
         TmpStatus.fKernel           = options.fKernel;              /* Smp or uni kernel. */
         TmpStatus.ulBuild           = options.ulBuild;              /* Kernel build. */
         TmpStatus.usVerMajor        = options.usVerMajor;           /* OS/2 major ver - 20 */
         TmpStatus.usVerMinor        = options.usVerMinor;           /* OS/2 minor ver - 30,40 */
+        #endif
         /* swappable heap */
         if (_swp_state((PHEAPSTATE)SSToDS(&HeapState)) == 0)
+        {
+            #if 0
             TmpStatus.cbSwpHeapInit  = options.cbSwpHeapInit;       /* Initial heapsize. */
+            #endif
             TmpStatus.cbSwpHeapFree  = HeapState.cbHeapFree;        /* Amount of used space. */
             TmpStatus.cbSwpHeapUsed  = HeapState.cbHeapUsed;        /* Amount of free space reserved. */
 …
         if (_res_state((PHEAPSTATE)SSToDS(&HeapState)) == 0)
+        {
+            #if 0
             TmpStatus.cbResHeapInit  = options.cbResHeapInit;       /* Initial heapsize. */
+            #endif
             TmpStatus.cbResHeapFree  = HeapState.cbHeapFree;        /* Amount of used space. */
             TmpStatus.cbResHeapUsed  = HeapState.cbHeapUsed;        /* Amount of free space reserved. */
 …
         strcpy((char*)SSToDS(TmpStatus.szBuildTime), szBuildTime);  /* Time of the win32k build. */
         TmpStatus.ulVersion         = PE2LX_VERSION;                /* Win32k version */
+        #if 0
         strcpy((char*)SSToDS(TmpStatus.szSymFile), szSymbolFile);   /* The name of the symbol file or sym database. */
+        #endif
         /* Module counts */

branches/splittup/src/win32k/k32/k32QuerySystemMemInfo.cpp

-              r5289
+              r6841
 /* $Id: k32QuerySystemMemInfo.cpp,v 1.2 2001-03-07 21:55:30 bird Exp $
+/* $Id: k32QuerySystemMemInfo.cpp,v 1.2.2.1 2001-09-27 03:08:23 bird Exp $
+ *
  * k32QuerySystemMemInfo - Collects more or less useful information on the
 …
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 #include <newexe.h>                     /* OS/2 NE structs and definitions. */
 #include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
 #include <string.h>                     /* C library string.h. */
 #include <stdlib.h>                     /* C library stdlib.h. */
 #include <stddef.h>                     /* C library stddef.h. */
-#include <stdarg.h>                     /* C library stdarg.h. */
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev1632.h"                    /* Common 16- and 32-bit parts */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
-#include "log.h"                        /* Logging. */
 #include "options.h"                    /* Win32k options. */
-#include "ProbKrnl.h"                   /* ProbKrnl variables and definitions. */
 #include "win32k.h"                     /* Win32k API structures.  */
 #include "k32.h"                        /* Internal Win32k API structures.  */
 …
         MemInfo.ulAddressLimit          = VirtualAddressLimit;
         vmRecalcShrBound(VMRSBF_ARENASHR, (PULONG)SSToDS(&MemInfo.ulVMArenaPrivMax));
         MemInfo.ulVMArenaSharedMin      = pahvmShr->ah_laddrMin;
         MemInfo.ulVMArenaSharedMax      = pahvmShr->ah_laddrMax;
         MemInfo.ulVMArenaSystemMin      = pahvmSys->ah_laddrMin;
         MemInfo.ulVMArenaSystemMax      = pahvmSys->ah_laddrMax;
         if (pahvmhShr && VirtualAddressLimit > 0x20000000) /* Not valid if less or equal to 512MB user memory */
+        MemInfo.ulVMArenaSharedMin      = ahvmShr.ah_laddrMin;
+        MemInfo.ulVMArenaSharedMax      = ahvmShr.ah_laddrMax;
+        MemInfo.ulVMArenaSystemMin      = ahvmSys.ah_laddrMin;
+        MemInfo.ulVMArenaSystemMax      = ahvmSys.ah_laddrMax;
+        if (&ahvmhShr && VirtualAddressLimit > 0x20000000) /* Not valid if less or equal to 512MB user memory */
+        {
             MemInfo.ulVMArenaHighSharedMin  = pahvmhShr->ah_laddrMin;
             MemInfo.ulVMArenaHighSharedMax  = pahvmhShr->ah_laddrMax;
+            MemInfo.ulVMArenaHighSharedMin  = ahvmhShr.ah_laddrMin;
+            MemInfo.ulVMArenaHighSharedMax  = ahvmhShr.ah_laddrMax;
             vmRecalcShrBound(VMRSBF_ARENAHIGH, (PULONG)SSToDS(&MemInfo.ulVMArenaHighPrivMax));
+        }

branches/splittup/src/win32k/k32/k32SetEnvironment.cpp

-              r6296
+              r6841
 /* $Id: k32SetEnvironment.cpp,v 1.2 2001-07-10 16:39:17 bird Exp $
+/* $Id: k32SetEnvironment.cpp,v 1.2.2.1 2001-09-27 03:08:23 bird Exp $
+ *
  * k32SetEnvironment - Sets the Odin32 environment for a process.
 …
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
 #include "win32k.h"
 #include "k32.h"
 …
 #include "dev32.h"
 #include "dev32hlp.h"
-#include "log.h"
-#include "macros.h"
-#include "avl.h"
 #include "PerTaskW32kData.h"

branches/splittup/src/win32k/k32/k32SetOptions.cpp

-              r5118
+              r6841
 /* $Id: k32SetOptions.cpp,v 1.7 2001-02-11 23:43:00 bird Exp $
+/* $Id: k32SetOptions.cpp,v 1.7.2.1 2001-09-27 03:08:23 bird Exp $
+ *
  * k32SetOptions - Sets the changable options of win32k.sys the options.
 …
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
 #define NO_WIN32K_LIB_FUNCTIONS
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 #include <newexe.h>                     /* OS/2 NE structs and definitions. */
 #include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
 #include <string.h>                     /* C library string.h. */
 …
 #include <stdarg.h>                     /* C library stdarg.h. */
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev1632.h"                    /* Common 16- and 32-bit parts */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
-#include "log.h"                        /* Logging. */
-#include "avl.h"                        /* AVL tree. (ldr.h need it) */
 #include "ldr.h"                        /* ldr helpers. (ldrGetExePath) */
 #include "env.h"                        /* Environment helpers. */
+#include "env.h" //todo                       /* Environment helpers. */
 #include "modulebase.h"                 /* ModuleBase class definitions, ++. */
 #include "pe2lx.h"                      /* Pe2Lx class definitions, ++. */
 …
 #include "options.h"                    /* Win32k options. */
-#include "ProbKrnl.h"                   /* ProbKrnl variables and definitions. */
 #include "win32k.h"                     /* Win32k API structures.  */
 #include "k32.h"                        /* Internal Win32k API structures.  */
 …
          * Validate contents.
          */
+        #if 0
         if (    TmpOptions.usCom != OUTPUT_COM1
             &&  TmpOptions.usCom != OUTPUT_COM2
 …
             &&  TmpOptions.usCom != OUTPUT_COM4)
             return ERROR_INVALID_PARAMETER;
+        #endif
         if (TmpOptions.fLogging > 1)
             return ERROR_INVALID_PARAMETER;
 …
         if (TmpOptions.fApiEnh > 1)
             return ERROR_INVALID_PARAMETER;
+        #if 0
         if (TmpOptions.cbSwpHeapMax > (32768*1024) || TmpOptions.cbSwpHeapMax < options.cbSwpHeapInit)
             return ERROR_INVALID_PARAMETER;
         if (TmpOptions.cbResHeapMax > (32768*1024) || TmpOptions.cbResHeapMax < options.cbResHeapInit)
             return ERROR_INVALID_PARAMETER;
+        #endif
         /*
 …
          * Apply changes
          */
+        #if 0
         options.usCom       = TmpOptions.usCom;         /* Output port no. */
+        #endif
         options.fLogging    = (USHORT)TmpOptions.fLogging;/* Logging. */
         options.fPE         = TmpOptions.fPE;           /* Flags set the type of conversion. */
 …
         options.fApiEnh     = TmpOptions.fApiEnh;       /* Enables the API enhancements */
+        #if 0
         options.cbSwpHeapMax = TmpOptions.cbSwpHeapMax; /* Maximum heapsize. */
         cbSwpHeapMax = (unsigned)options.cbSwpHeapMax;
         options.cbResHeapMax = TmpOptions.cbResHeapMax; /* Maxiumem residentheapsize. */
         cbResHeapMax = (unsigned)options.cbResHeapMax;
+        #endif
         /*

branches/splittup/src/win32k/ldr/ModuleBase.cpp

-              r5086
+              r6841
 /* $Id: ModuleBase.cpp,v 1.7 2001-02-10 11:11:44 bird Exp $
+/* $Id: ModuleBase.cpp,v 1.7.2.1 2001-09-27 03:08:24 bird Exp $
+ *
  * ModuleBase - Implementetation.
 …
 #endif
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
+#define INCL_KKL_PRINTF
 …
 *******************************************************************************/
 #include <os2.h>                        /* OS/2 header file. */
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "malloc.h"                     /* Win32k malloc. Not C library! */
 #include <string.h>                     /* C library string.h. */
+#include <stdarg.h>                     /* C library stdarg.h. */
+#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
 #include "modulebase.h"                 /* ModuleBase class definitions, ++. */

branches/splittup/src/win32k/ldr/ldr.cpp

-              r5086
+              r6841
 /* $Id: ldr.cpp,v 1.10 2001-02-10 11:11:45 bird Exp $
+/* $Id: ldr.cpp,v 1.10.2.1 2001-09-27 03:08:24 bird Exp $
+ *
  * ldr.cpp - Loader helpers.
 …
 #define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"
-#include "malloc.h"
-#include "new.h"
 #include <memory.h>
 #include <stdlib.h>
 …
 #include <string.h>
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"
 #include "ModuleBase.h"
 …
 *   Global Variables                                                           *
 *******************************************************************************/
 static PAVLNODECORE    pSFNRoot = NULL;
 static PAVLNODECORE    pMTERoot = NULL;
+static PAVLULNODECORE   pSFNRoot = NULL;
+static PAVLULNODECORE   pMTERoot = NULL;
 …
  * @returns   Pointer to module node. If not found NULL.
  * @param     hFile  File handle of the module to be found.
  * @sketch    return a AVLGet on the pSFNRoot-tree.
+ * @sketch    return a AVLULGet on the pSFNRoot-tree.
  * @status    completely implemented.
  * @author    knut st. osmundsen
 …
 PMODULE     getModuleBySFN(SFN hFile)
+{
     return (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)hFile);
+    return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)hFile);
+}
 …
     #if 0
         /* Not 100% sure that this will work correctly! */
         PMODULE pMod = (PMODULE)AVLGet(&pMTERoot, (AVLKEY)pMTE);
+        PMODULE pMod = (PMODULE)AVLULGet(&pMTERoot, (AVLULKEY)pMTE);
         if (pMod == NULL)
+        {
 …
+                }
             #endif
             pMod = (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+            pMod = (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
             if (pMod != NULL)
+            {
                 pMod->coreMTE.Key = (AVLKEY)pMTE;
+                pMod->coreMTE.Key = (AVLULKEY)pMTE;
                 pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
                 AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+                AVLInsert(&pMTERoot, (PAVLULNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+            }
+        }
 …
         #endif
         if (GetState(pMTE->mte_sfn) == HSTATE_OUR)
             return (PMODULE)AVLGet(&pSFNRoot, (AVLKEY)pMTE->mte_sfn);
+            return (PMODULE)AVLULGet(&pSFNRoot, (AVLULKEY)pMTE->mte_sfn);
         return NULL;
 …
     PMODULE pMod;
     #ifdef DEBUG
         if (AVLGet(&pSFNRoot, (AVLKEY)hFile) != NULL)
+        if (AVLULGet(&pSFNRoot, (AVLULKEY)hFile) != NULL)
             kprintf(("addModule: Module allready present in the SFN-tree!\n"));
         if (hFile == 0)
 …
     /* fill in the module node. */
     pMod->coreKey.Key = (AVLKEY)hFile;
+    pMod->coreKey.Key = (AVLULKEY)hFile;
     pMod->hFile = hFile;
     pMod->pMTE = pMTE;
 …
     /* insert the module node into the tree(s) */
     AVLInsert(&pSFNRoot, (PAVLNODECORE)pMod);
+    AVLULInsert(&pSFNRoot, (PAVLULNODECORE)pMod);
     if (pMTE != NULL)
+    {
         pMod->coreMTE.Key = (AVLKEY)pMTE;
+        pMod->coreMTE.Key = (AVLULKEY)pMTE;
         pMod->fFlags |= MOD_FLAGS_IN_MTETREE;
         AVLInsert(&pMTERoot, (PAVLNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+        AVLULInsert(&pMTERoot, (PAVLULNODECORE)((unsigned)pMod + offsetof(MODULE, coreMTE)));
+    }
 …
 ULONG      removeModule(SFN hFile)
+{
     PMODULE pMod = (PMODULE)AVLRemove(&pSFNRoot, (AVLKEY)hFile);
+    PMODULE pMod = (PMODULE)AVLULRemove(&pSFNRoot, (AVLULKEY)hFile);
     if (pMod == NULL)
+    {
 …
     if (pMod->fFlags & MOD_FLAGS_IN_MTETREE)
+    {
         if (AVLRemove(&pMTERoot, (AVLKEY)pMod->pMTE) == NULL)
+        {
             kprintf(("removeModule: MOD_FLAGS_IN_MTETREE set but AVLRemove returns NULL\n"));
+        if (AVLULRemove(&pMTERoot, (AVLULKEY)pMod->pMTE) == NULL)
+        {
+            kprintf(("removeModule: MOD_FLAGS_IN_MTETREE set but AVLULRemove returns NULL\n"));
+        }
+    }
 …
          * Then get the pMTE, and access the smte_path to get a pointer to the executable path.
          */
         PPTDA   pPTDACur;               /* Pointer to the current (system context) PTDA */
+        PPTDA   pPTDA1;                 /* Pointer to the current (system context) PTDA */
         PPTDA   pPTDA;                  /* PTDA in question. */
         HMTE    hMTE = NULLHANDLE;      /* Modulehandle of the executable module. */
 …
          *  IF no pPTDAExecChild THEN  get hMte for the current PTDA.
          */
         pPTDACur = ptdaGetCur();
         if (pPTDACur != NULL)
+        {
             pPTDA = ptdaGet_pPTDAExecChild(pPTDACur);
+        pPTDA1 = ptdaGetCur();
+        if (pPTDA1 != NULL)
+        {
+            pPTDA = ptdaGet_pPTDAExecChild(pPTDA1);
             if (pPTDA != NULL && fExecChild)
                 hMTE = ptdaGet_ptda_module(pPTDA);
             if (hMTE == NULLHANDLE)
                 hMTE = ptdaGet_ptda_module(pPTDACur);
+                hMTE = ptdaGet_ptda_module(pPTDA1);
+        }
         else

branches/splittup/src/win32k/ldr/myLDRGetProcAddr.cpp

-              r5086
+              r6841
 /* $Id: myLDRGetProcAddr.cpp,v 1.2 2001-02-10 11:11:45 bird Exp $
+/* $Id: myLDRGetProcAddr.cpp,v 1.2.2.1 2001-09-27 03:08:25 bird Exp $
+ *
  * LDRGetProcAddr - Get an entry point to a module.
 …
 #define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "dev32.h"
 #include "ldr.h"

branches/splittup/src/win32k/ldr/myLDRQAppType.cpp

-              r5086
+              r6841
 /* $Id: myLDRQAppType.cpp,v 1.5 2001-02-10 11:11:45 bird Exp $
+/* $Id: myLDRQAppType.cpp,v 1.5.2.1 2001-09-27 03:08:25 bird Exp $
+ *
  * _myLDRQAppType - _LDRQAppType overload.
 …
 #define INCL_OS2KRNL_SEM
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "OS2Krnl.h"
-#include "avl.h"
 #include "ldr.h"
-#include "log.h"

branches/splittup/src/win32k/ldr/myVMAllocMem.cpp

-              r5086
+              r6841
 /* $Id: myVMAllocMem.cpp,v 1.3 2001-02-10 11:11:45 bird Exp $
+/* $Id: myVMAllocMem.cpp,v 1.3.2.1 2001-09-27 03:08:25 bird Exp $
+ *
  * Debug module - overloads VMAllocMem to analyse input parameters....
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_OS2KRNL_VM
+#define INCL_KKL_AVL
+#define INCL_KKL_LOG
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
-#include "log.h"
-#include "OS2Krnl.h"
-#include "avl.h"
 #include "ldr.h"
 …
     APIRET rc;
     rc = VMAllocMem(p1,p2,p3,p4,p5,p6,p7,p8,p9);
+    rc = VMAllocMem(p1,p2,p3,p4,p5,p6,p7,p8,(PVMAC)p9);
     return rc;

branches/splittup/src/win32k/ldr/myldrCheckInternalName.cpp

-              r6193
+              r6841
 /* $Id: myldrCheckInternalName.cpp,v 1.5 2001-07-07 04:39:57 bird Exp $
+/* $Id: myldrCheckInternalName.cpp,v 1.5.2.1 2001-09-27 03:08:25 bird Exp $
+ *
  * ldrCheckInternalName - ldrCheckInternalName replacement with support for
  *                  long DLL names and no .DLL-extention dependency.
+ *
  * Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "dev32.h"
 #include "ldr.h"

branches/splittup/src/win32k/ldr/myldrClose.cpp

-              r5086
+              r6841
 /* $Id: myldrClose.cpp,v 1.7 2001-02-10 11:11:46 bird Exp $
+/* $Id: myldrClose.cpp,v 1.7.2.1 2001-09-27 03:08:26 bird Exp $
+ *
  * myldrClose - ldrClose
+ *
  * Copyright (c) 1998-1999 knut st. osmundsen
+ * Copyright (c) 1998-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"
 #include "ModuleBase.h"

branches/splittup/src/win32k/ldr/myldrEnum32bitRelRecs.cpp

-              r5086
+              r6841
 /* $Id: myldrEnum32bitRelRecs.cpp,v 1.5 2001-02-10 11:11:46 bird Exp $
+/* $Id: myldrEnum32bitRelRecs.cpp,v 1.5.2.1 2001-09-27 03:08:26 bird Exp $
+ *
  * myldrEnum32bitRelRecs - ldrEnum32bitRelRecs
+ *
  * Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "avl.h"
-#include "log.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"
 #include "ModuleBase.h"

branches/splittup/src/win32k/ldr/myldrFindModule.cpp

-              r6192
+              r6841
 /* $Id: myldrFindModule.cpp,v 1.3 2001-07-07 04:39:11 bird Exp $
+/* $Id: myldrFindModule.cpp,v 1.3.2.1 2001-09-27 03:08:26 bird Exp $
+ *
  * ldrFindModule - ldrFindModule replacement with support for long DLL names
  *                  and .DLL-extention dependency.
+ *
  * Copyright (c) 1999-2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 1999-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "dev32.h"
 #include "ldr.h"
 #include "ModuleBase.h"
 #include "options.h"
-/*******************************************************************************
-*   Global Variables                                                           *
-*******************************************************************************/
-extern  PPMTE pmte_h;
-extern  PPMTE pprogram_h;
-extern  PPMTE pprogram_l;
-extern  PPMTE pglobal_h;
-extern  PPMTE pglobal_l;
-extern  PPMTE pspecific_h;
-extern  PPMTE pspecific_l;
 /*******************************************************************************
 …
     static PMTE  pmteNULL = NULL;
     static PPMTE ppmteNULL = &pmteNULL;
     static PPMTE * apppmteHeadTail[] =
+    static PMTE  apmteHeadTail[] =
     {/* head           tail */
         &pmte_h,        &ppmteNULL,     /* CLASS_ALL        0x00000000 */
         &pprogram_h,    &pprogram_l,    /* CLASS_PROGRAM    0x00000040 */
         &pglobal_h,     &pglobal_l,     /* CLASS_GLOBAL     0x00000080 */
         &pspecific_h,   &pspecific_l,   /* CLASS_SPECIFIC   0x000000c0 */
+        mte_h,        pmteNULL,         /* CLASS_ALL        0x00000000 */
+        program_h,    program_l,        /* CLASS_PROGRAM    0x00000040 */
+        global_h,     global_l,         /* CLASS_GLOBAL     0x00000080 */
+        specific_h,   specific_l,       /* CLASS_SPECIFIC   0x000000c0 */
     };
 …
      * Find start and end mte node
      */
     pmte = **apppmteHeadTail[usClass >> 5];
     pmteEnd = **apppmteHeadTail[(usClass >> 5) + 1];
+    pmte = apmteHeadTail[usClass >> 5];
+    pmteEnd = apmteHeadTail[(usClass >> 5) + 1];
     if (pmteEnd != NULL)                /* Advance one node - see loop condition. */
         pmteEnd = pmteEnd->mte_link;

branches/splittup/src/win32k/ldr/myldrGetFileName.asm

r5247	r6841
1		; $Id: myldrGetFileName.asm,v 1.2 ~~2001-02-23 02:57:54~~ bird Exp $
	1	; $Id: myldrGetFileName.asm,v 1.2.2.1 2001-09-27 03:08:26 bird Exp $
2	2	;
3	3	; myldrGetFileName2 - assembly helper for ldrGetFileName.
…	…
5	5	; doesn't have a path, and return correct *ppachExt.
6	6	;
7		; Copyright (c) 2000 ~~knut st. osmundsen~~
	7	; Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
8	8	;
9	9	; Project Odin Software License can be found in LICENSE.TXT

branches/splittup/src/win32k/ldr/myldrOpen.cpp

-              r6009
+              r6841
 /* $Id: myldrOpen.cpp,v 1.16 2001-06-14 12:19:41 bird Exp $
+/* $Id: myldrOpen.cpp,v 1.16.2.1 2001-09-27 03:08:27 bird Exp $
+ *
  * myldrOpen - ldrOpen.
 …
 #define INCL_OS2KRNL_SEC
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "rmalloc.h"
-#include "malloc.h"
 #include <memory.h>
 #include <stdlib.h>
 …
 #include <stdarg.h>
-#include "log.h"
-#include "avl.h"
 #include "options.h"
-#include <peexe.h>
-#include <exe386.h>
 #include "elf.h"
 #include "OS2Krnl.h"
 …
 #include "pe2lx.h"
 #include "myExecPgm.h"
+#include "env.h"
+#include "vprintf.h"                    /* Make 100% sure we have va_start.  */
+#include "env.h"                        /* TODO */

branches/splittup/src/win32k/ldr/myldrOpenPath.cpp

-              r5086
+              r6841
 /* $Id: myldrOpenPath.cpp,v 1.5 2001-02-10 11:11:46 bird Exp $
+/* $Id: myldrOpenPath.cpp,v 1.5.2.1 2001-09-27 03:08:27 bird Exp $
+ *
  * myldrOpenPath - ldrOpenPath used to open executables we'll override
  * this to altern the search path for DLLs.
+ *
  * Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+ * Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
 #include "dev32.h"
 #include "dev32hlp.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
-#include "avl.h"
 #include "ldr.h"
 #include "ModuleBase.h"

branches/splittup/src/win32k/ldr/myldrOpenPatha.asm

-              r5247
+              r6841
 ; $Id: myldrOpenPatha.asm,v 1.5 2001-02-23 02:57:54 bird Exp $
+; $Id: myldrOpenPatha.asm,v 1.5.2.1 2001-09-27 03:08:27 bird Exp $
+;
 ; myldrOpenPatha - assembly helpers for myldrOpenPath.
+;
 ; Copyright (c) 2000 knut st. osmundsen
+; Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
+;
 ; Project Odin Software License can be found in LICENSE.TXT
 …
+;
     include devsegdf.inc
-    include options.inc
+;
 …
+;
     extrn _ldrOpenPath_wrapped:PROC            ; calltab entry
     extrn _options:options
+    extrn ulKernelBuild:ABS
 …
 _ldrOpenPath@20 PROC NEAR
     ASSUME ds:FLAT
+    cmp     FLAT:DATA16:_options.ulBuild, 14053
+    jge      new
+    mov     eax, ulKernelBuild
+    cmp     eax, 14053
+    jge     new
 if 0
 …
+    ;
 if 0
     extrn   pulTKSSBase32:DWORD
+    extrn   _TKSSBase:DWORD
     push    ecx
     push    edi
 …
     pop     es
+    mov     edi, pulTKSSBase32
+    mov     edi, [edi]
+    mov     edi, _TKSSBase
     add     edi, esp
     mov     ecx, esp

branches/splittup/src/win32k/ldr/myldrRead.cpp

-              r5086
+              r6841
 /* $Id: myldrRead.cpp,v 1.9 2001-02-10 11:11:47 bird Exp $
+/* $Id: myldrRead.cpp,v 1.9.2.1 2001-09-27 03:08:28 bird Exp $
+ *
  * myldrRead - ldrRead.
 …
 #define INCL_NOPMAPI
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
 #include "dev32.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"
 #include "ModuleBase.h"

branches/splittup/src/win32k/ldr/myldrSetVMflags.cpp

-              r5086
+              r6841
 /* $Id: myldrSetVMflags.cpp,v 1.2 2001-02-10 11:11:47 bird Exp $
+/* $Id: myldrSetVMflags.cpp,v 1.2.2.1 2001-09-27 03:08:28 bird Exp $
+ *
  * myldrSetVMflags - ldrSetVMflags
+ *
  * Copyright (c) 2000 knut st. osmundsen
+ * Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.com)
+ *
  * Project Odin Software License can be found in LICENSE.TXT
 …
 #define INCL_OS2KRNL_VM
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "ldr.h"

branches/splittup/src/win32k/ldr/myldrWasLoadModuled.cpp

-              r5086
+              r6841
 /* $Id: myldrWasLoadModuled.cpp,v 1.2 2001-02-10 11:11:47 bird Exp $
+/* $Id: myldrWasLoadModuled.cpp,v 1.2.2.1 2001-09-27 03:08:28 bird Exp $
+ *
  * ldrWasLoadModuled - Tells OS/2 that the executable module was LoadModuled
 …
 #define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_LDR
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <peexe.h>
+#include <exe386.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include <memory.h>
 …
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "log.h"
-#include "avl.h"
-#include <peexe.h>
-#include <exe386.h>
-#include "OS2Krnl.h"
 #include "dev32.h"
 #include "ldr.h"

branches/splittup/src/win32k/ldr/mytkExecPgm.asm

-              r5247
+              r6841
 ; $Id: mytkExecPgm.asm,v 1.13 2001-02-23 02:57:55 bird Exp $
+; $Id: mytkExecPgm.asm,v 1.13.2.1 2001-09-27 03:08:28 bird Exp $
+;
 ; mytkExecPgm - tkExecPgm overload
+;
 ; Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+; Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.no)
+;
 ; Project Odin Software License can be found in LICENSE.TXT
 …
     ; LDR semaphore
+    ;
     extrn pLdrSem:DWORD
+    extrn _LdrSem:DWORD
     extrn _LDRClearSem@0:PROC
     extrn _KSEMRequestMutex@8:PROC
 …
     ; TKSSBase (32-bit)
+    ;
     extrn pulTKSSBase32:DWORD
+    extrn _TKSSBase:DWORD
+;
 …
     ASSUME  DS:FLAT, ES:FLAT
     mov     eax, pLdrSem                ; Get pointer to the loader semaphore.
+    mov     eax, offset _LdrSem         ; Get pointer to the loader semaphore.
     or      eax, eax                    ; Check if null. (paranoia)
     jz      tkepgm_backout              ; Fail if null.
 …
+    ;
     push    0                           ; Usage count variable.
+    mov     eax, pulTKSSBase32          ; Get TKSSBase
+    mov     eax, [eax]
+    mov     eax, _TKSSBase              ; Get TKSSBase
     add     eax, esp                    ; Added TKSSBase to the usage count pointer
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
+    push    offset _LdrSem              ; Push pointer to loader semaphore ( = handle).
     call    _KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)

branches/splittup/src/win32k/ldr/mytkStartProcess.asm

-              r5247
+              r6841
 ; $Id: mytkStartProcess.asm,v 1.4 2001-02-23 02:57:55 bird Exp $
+; $Id: mytkStartProcess.asm,v 1.4.2.1 2001-09-27 03:08:29 bird Exp $
+;
 ; tkStartProcess overloader. Needed to clear the loader semaphore
 ; when a process is being started syncronously.
+;
 ; Copyright (c) 2000 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+; Copyright (c) 2000-2001 knut st. osmundsen (kosmunds@csc.no)
+;
 ; Project Odin Software License can be found in LICENSE.TXT
 …
     ; LDR semaphore
+    ;
     extrn pLdrSem:DWORD
+    extrn _LdrSem:DWORD
     extrn _LDRClearSem@0:PROC
     extrn _KSEMQueryMutex@8:PROC
 …
     ; TKSSBase (32-bit)
+    ;
     extrn pulTKSSBase32:DWORD
+    extrn _TKSSBase:DWORD
+    ;
 …
     push    0                           ; Usage count variable.
+    mov     eax, pulTKSSBase32          ; Get TKSSBase
+    mov     eax, [eax]
+    mov     eax, _TKSSBase              ; Get TKSSBase
     add     eax, esp                    ; Added TKSSBase to the usage count pointer
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
+    push    offset _LdrSem              ; Push pointer to loader semaphore ( = handle).
     call    _KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)

branches/splittup/src/win32k/ldr/xx2lxmain.cpp

-              r5293
+              r6841
 /* $Id: xx2lxmain.cpp,v 1.1 2001-03-11 16:37:17 bird Exp $
+/* $Id: xx2lxmain.cpp,v 1.1.2.1 2001-09-27 03:08:29 bird Exp $
+ *
  * Xx2Lx main program. (Ring 3 only!)
 …
 *******************************************************************************/
 char            szBackupXxFilename[CCHMAXPATH];        /* too save stack/heap */
 struct options  options = DEFAULT_OPTION_ASSIGMENTS;
+struct Win32kOptions  options = DEFAULT_OPTION_ASSIGMENTS;
 /*******************************************************************************

branches/splittup/src/win32k/misc/PerTaskW32kData.c

-              r6296
+              r6841
 /* $Id: PerTaskW32kData.c,v 1.2 2001-07-10 16:39:19 bird Exp $
+/* $Id: PerTaskW32kData.c,v 1.2.2.1 2001-09-27 03:08:30 bird Exp $
+ *
  * Per Task (Win32k) Data.
 …
 #define INCL_OS2KRNL_TK                 /* OS2KRNL: Task Stuff */
 #define INCL_OS2KRNL_PTDA
+#define INCL_KKL_AVL
+#define INCL_KKL_LOG
+#define INCL_KKL_HEAP
 /*******************************************************************************
 …
 *******************************************************************************/
 #include <os2.h>
+#include <OS2Krnl.h>
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
 #include "dev32.h"
 #include "dev32hlp.h"
-#include "log.h"
-#include "OS2Krnl.h"
 #include <string.h>
-#include "macros.h"
-#include "avl.h"
 #include "PerTaskW32kData.h"
-#include "rmalloc.h"
 …
 *   Global Variables                                                           *
 *******************************************************************************/
 /*static*/ PAVLNODECORE pPTDTree;       /* Pointer to PTD tree */
+/*static*/ PAVLPVNODECORE pPTDTree;     /* Pointer to PTD tree */
                                         /* Currently assumed protected by ldrSem. */
 …
     if (pPTDA == 0)
         pPTDA = ptdaGetCur();
     pptd = (PPTD)(void*)AVLGet(&pPTDTree, (AVLKEY)pPTDA);
+    pptd = (PPTD)(void*)AVLPVGet(&pPTDTree, pPTDA);
     if (!pptd && fCreate)
+    {
 …
+        }
         memset(pptd, 0, sizeof(*pptd));
         pptd->core.Key = (AVLKEY)pPTDA;
         AVLInsert(&pPTDTree, &pptd->core);
+        pptd->core.Key = pPTDA;
+        AVLPVInsert(&pPTDTree, &pptd->core);
+    }
     return pptd;
 …
     if (pPTDA == 0)
         pPTDA = ptdaGetCur();
     pptd = (PPTD)(void*)AVLRemove(&pPTDTree, (AVLKEY)pPTDA);
+    pptd = (PPTD)(void*)AVLPVRemove(&pPTDTree, pPTDA);
     if (pptd)
+    {

branches/splittup/src/win32k/pe2lx/pe2lx.cpp

-              r6493
+              r6841
 /* $Id: pe2lx.cpp,v 1.32 2001-08-08 17:24:45 bird Exp $
+/* $Id: pe2lx.cpp,v 1.32.2.1 2001-09-27 03:08:34 bird Exp $
+ *
  * Pe2Lx class implementation. Ring 0 and Ring 3
 …
 #define INCL_OS2KRNL_LDR                /* Loader definitions. */
 #define INCL_OS2KRNL_PTDA               /* PTDA definitions. */
+#define INCL_KKL_LOG
+#define INCL_KKL_AVL
+#define INCL_KKL_HEAP
 #ifdef RING0
     #define INCL_NOAPI                  /* RING0: No apis. */
+    #define Yield() D32Hlp_Yield()
 #else /*RING3*/
     #define INCL_DOSPROCESS             /* RING3: DosSleep. */
     #define INCL_OS2KRNL_LDR_NOAPIS     /* No apis */
+    #define Yield() DosSleep(0)
 #endif
 …
 #include <newexe.h>                     /* OS/2 NE structs and definitions. */
 #include <exe386.h>                     /* OS/2 LX structs and definitions. */
+#include <OS2Krnl.h>                    /* kernel structs.  (SFN) */
+#include <kKrnlLib.h>
 #include "devSegDf.h"                   /* Win32k segment definitions. */
-#include "malloc.h"                     /* win32k malloc (resident). Not C library! */
-#include "smalloc.h"                    /* win32k swappable heap. */
-#include "rmalloc.h"                    /* win32k resident heap. */
 #include <string.h>                     /* C library string.h. */
 …
 #include <stdarg.h>                     /* C library stdarg.h. */
-#include "vprintf.h"                    /* win32k printf and vprintf. Not C library! */
 #include "dev32.h"                      /* 32-Bit part of the device driver. (SSToDS) */
-#include "OS2Krnl.h"                    /* kernel structs.  (SFN) */
 #ifdef RING0
-    #include "avl.h"                    /* AVL tree. (ldr.h need it) */
     #include "ldr.h"                    /* ldr helpers. (ldrGetExePath) */
     #include "env.h"                    /* Environment helpers. */
 …
 #include "pe2lx.h"                      /* Pe2Lx class definitions, ++. */
 #include <versionos2.h>                 /* Pe2Lx version. */
-#include "yield.h"                      /* Yield CPU. */
 #include "options.h"                    /* Win32k options. */
 …
             case FINDDLL_LIBPATH:
                 pszPath = *pLdrLibPath;
+                pszPath = LdrLibPath;
                 break;

branches/splittup/src/win32k/test/fake.c

-              r6288
+              r6841
 /* $Id: fake.c,v 1.9 2001-07-10 05:26:51 bird Exp $
+/* $Id: fake.c,v 1.9.4.1 2001-09-27 03:08:35 bird Exp $
+ *
  * Fake stubs for the ldr and kernel functions we imports or overloads.
 …
 /**
+ *
+ * @returns     OS/2 return code.
+ * @param       pid     Process Identifier.
+ * @param       ppPTDA  Pointer to the PTDA-pointer variabel which is to receive
+ *                      the PTDA pointer on successful return.
+ */
+ULONG KRNLCALL   fakeTKScanTasks(ULONG flFlags, ULONG id, PTKSCANTASKWORKER pfnWorker, ULONG ulArg);
+{
+    DUMMY();
+    printf("fakeTKScanTasks:                       - not implemented\n");
+    return ERROR_NOT_SUPPORTED;
+}
+/**
  * Force a thread to be made ready.
  * @param   flFlag  Which flag(s?) to set.

branches/splittup/src/win32k/win32k.def

-              r5247
+              r6841
 ;******************************************************************************
 ; Copyright 1998-2000 knut st. osmundsen
+; Copyright 1998-2001 knut st. osmundsen
 ; Definition file for Win32k
 ; Project Odin Software License can be found in LICENSE.TXT
 ;******************************************************************************
 PHYSICAL DEVICE Grace
 DESCRIPTION "Odin32 Ring-0 support driver - copyright (c) 1998-2000 knut st. osmundsen"
+PHYSICAL DEVICE Win32k
+DESCRIPTION "Odin32 Ring-0 support driver - copyright (c) 1998-2001 knut st. osmundsen"
 CODE PRELOAD EXECUTEREAD

branches/splittup/src/win32k/win32k.mak

-              r6429
+              r6841
 # $Id: win32k.mak,v 1.13 2001-07-31 21:34:08 bird Exp $
+# $Id: win32k.mak,v 1.13.2.1 2001-09-27 03:08:08 bird Exp $
+#
 # Win32k.sys makefile.
+#
 # Copyright 1998-2001 knut st. osmundsen (knut.stange.osmundsen@mynd.no)
+# Copyright 1998-2001 knut st. osmundsen (kosmunds@csc.com)
+#
 # Project Odin Software License can be found in LICENSE.TXT
 …
     $(WIN32KOBJ)\d16strat.obj \
     $(WIN32KOBJ)\d32CallGate.obj \
-    $(WIN32KOBJ)\d32hlp.obj \
     $(WIN32KOBJ)\d32globals.obj \
     $(WIN32KOBJ)\d16globl.obj \
-    $(WIN32KOBJ)\abort.obj \
-    $(WIN32KOBJ)\asmutils.obj \
-    $(WIN32KOBJ)\calltaba.obj \
-    $(WIN32KOBJ)\locks.obj \
-    $(WIN32KOBJ)\malloc.obj \
-    $(WIN32KOBJ)\smalloc_avl.obj \
-    $(WIN32KOBJ)\avl.obj \
-    $(WIN32KOBJ)\rmalloc_avl.obj \
-    $(WIN32KOBJ)\new.obj \
-    $(WIN32KOBJ)\env.obj \
     $(WIN32KOBJ)\PerTaskW32kData.obj \
-    $(WIN32KOBJ)\stricmp.obj \
-    $(WIN32KOBJ)\yield.obj \
-    $(WIN32KOBJ)\vsprintf.obj \
-    $(WIN32KOBJ)\vprintf.obj \
     $(WIN32KOBJ)\ldr.obj \
     $(WIN32KOBJ)\myldrClose.obj \
 …
     $(WIN32KOBJ)\myldrGetFileName.obj \
     $(WIN32KOBJ)\d32Events.obj \
-    $(WIN32KOBJ)\OS2KTCB.obj \
-    $(WIN32KOBJ)\OS2KPTDA.obj \
     $(WIN32KOBJ)\pe2lx.obj \
     $(WIN32KOBJ)\ModuleBase.obj \
-    $(WIN32KOBJ)\d32ElfIOCtl.obj \
     $(WIN32KOBJ)\d32Win32kIOCtl.obj \
     $(WIN32KOBJ)\d32Win32kOpenClose.obj \
 …
     $(WIN32KOBJ)\vprntf16.obj \
     $(WIN32KOBJ)\d32init.obj \
+    $(WIN32KOBJ)\d16init.obj_init \
+    $(WIN32KOBJ)\ProbKrnl.obj_init \
+    $(WIN32KOBJ)\SymDB.obj
+    $(WIN32KOBJ)\d16init.obj_init
 LASTOBJ =\
 …
     $(DDKPATH)\lib\os2386.lib \
     $(WIN32KOBJ)\devhelp.lib \
+    $(WIN32KOBJ)\clib.lib
+    $(WIN32KOBJ)\clib.lib \
+    $(ODIN32_LIB)\kKrnlLib.lib
 …
 $(NAME).sys: $(WIN32KBIN)\$(NAME).sys
 $(WIN32KBIN)\$(NAME).sys:   clfix.exe \
+$(WIN32KBIN)\$(NAME).sys:   $(WIN32KBIN)\clfix.exe \
                             $(WIN32KINCLUDE)\options.inc \
                             $(WIN32KINCLUDE)\api.inc \
 …
 # Add bldlevel signature to win32k.def - creates temporary win32kbldlevel.def.
 $(WIN32KOBJ)\$(NAME)bldlevel.def: $(NAME).def win32k.mak MakeDesc.cmd
+$(WIN32KOBJ)\$(NAME)bldlevel.def: $(NAME).def win32k.mak
     -$(ECHO) Creates $@ with bldlevel signature string.
     $(BLDLEVELINF) $(NAME).def $@ -R"$(NAME).def" \
 …
 TSTOBJS =\
     $(WIN32KOBJ)\devfirst.obj \
-    $(WIN32KOBJ)\$(NAME)tst.obj \
-    $(WIN32KOBJ)\dh.obj \
-    $(WIN32KOBJ)\dos.obj \
-    $(WIN32KOBJ)\dosa.obj \
-    $(WIN32KOBJ)\init.obj \
-    $(WIN32KOBJ)\fake.obj \
-    $(WIN32KOBJ)\fakea.obj \
-    $(WIN32KOBJ)\TstFakers.obj \
     $(WIN32KOBJ)\d16strat.obj \
     $(WIN32KOBJ)\d32CallGate.obj \
 …
     $(WIN32KOBJ)\d32globals.obj \
     $(WIN32KOBJ)\d16globl.obj \
-    $(WIN32KOBJ)\abort.obj \
     $(WIN32KOBJ)\asmutils.obj \
-    $(WIN32KOBJ)\calltaba.obj \
     $(WIN32KOBJ)\locks.obj \
-    $(WIN32KOBJ)\malloc.obj_tst. \
-    $(WIN32KOBJ)\smalloc_avl.obj \
-    $(WIN32KOBJ)\avl.obj \
-    $(WIN32KOBJ)\rmalloc_avl.obj \
-    $(WIN32KOBJ)\new.obj \
-    $(WIN32KOBJ)\env.obj \
     $(WIN32KOBJ)\PerTaskW32kData.obj \
-    $(WIN32KOBJ)\stricmp.obj \
-    $(WIN32KOBJ)\yield.obj \
-    $(WIN32KOBJ)\vsprintf.obj \
-    $(WIN32KOBJ)\vprintf.obj_tst. \
     $(WIN32KOBJ)\ldr.obj \
     $(WIN32KOBJ)\myldrClose.obj \
 …
     $(WIN32KOBJ)\pe2lx.obj \
     $(WIN32KOBJ)\ModuleBase.obj \
-    $(WIN32KOBJ)\d32ElfIOCtl.obj \
     $(WIN32KOBJ)\d32Win32kIOCtl.obj \
     $(WIN32KOBJ)\d32Win32kOpenClose.obj \
 …
     $(WIN32KOBJ)\d32init.obj_tst. \
     $(WIN32KOBJ)\d16init.obj_tst_init. \
+    $(WIN32KOBJ)\ProbKrnl.obj_tst_init. \
+    $(WIN32KOBJ)\SymDB.obj
+    $(WIN32KOBJ)\$(NAME)tst.obj \
+    $(WIN32KOBJ)\dh.obj \
+    $(WIN32KOBJ)\dos.obj \
+    $(WIN32KOBJ)\dosa.obj \
+    $(WIN32KOBJ)\init.obj \
+    $(WIN32KOBJ)\fake.obj \
+    $(WIN32KOBJ)\fakea.obj \
 TSTLASTOBJ = $(LASTOBJ)
 …
+#
-# Generate calltaba.asm
+#
-ldr\calltaba.asm \
-$(WIN32KBASE)\ldr\calltaba.asm : dev16\probkrnl.c $(WIN32KBIN)\mkcalltab.exe
-    $(WIN32KBIN)\mkcalltab.exe calltab > $@
+#
-# Generate TstFakers.c
+#
-test\TstFakers.c \
-$(WIN32KBASE)\test\TstFakers.c: dev16\probkrnl.c include\probkrnl.h $(WIN32KBIN)\mkcalltab.exe
-    $(WIN32KBIN)\mkcalltab.exe tstfakers > $@
+#
 # Make assembly version of options.h; options.inc
+#
 …
 # Make the convert tool.
+#
+$(WIN32KBIN)\libconv.exe: libconv.c
+    icc -Q+ -Ti+ -Fe$@ -Fo$(WIN32KOBJ)\$(*B).obj libconv.c
+#
+# Make the MkCallTab.exe utillity.
+#
+# MkCallTab objects.
+MKCALLTABOBJS = \
+    $(WIN32KOBJ)\mkcalltab.obj_c \
+    $(WIN32KOBJ)\probkrnl.obj_c \
+    $(WIN32KOBJ)\d16globl.obj_c \
+    $(WIN32KOBJ)\vprntf16.obj_c
+# Rule to build MkCallTab.exe
+mkcalltab.exe mkcalltab: $(WIN32KBIN)\mkcalltab.exe
+$(WIN32KBIN)\mkcalltab.exe: clfix.exe $(MKCALLTABOBJS)
+    $(LD) $(LFLAGS) /pmtype:vio @<<$(WIN32KOBJ)\$(@B).lnk
+        /OUT:$@
+        /MAP:$(WIN32KBIN)\$(@B).map
+        $(MKCALLTABOBJS)
+        $(TOOLKIT)\lib\os2286.lib
+        $(MSCPATH)\lib\clibcep.lib
+<<keep
+# Interference rule to make the MkCallTab objects.
+{dev16}.c.obj_c:
+    @$(ECHO) compiling 16bit (mkcalltab): $<
+    @$(CC16) -c -W3 -Asfw -G2s -Zp -Zl -nologo -Fa -Zi -Od -Lp -DDEBUG -DEXTRACT \
+        -Fa$(WIN32KLIST)\$(*B)_c.s -Fo$(WIN32KOBJ)\$(@B).obj_c $(CINCLUDES16) $<
+$(WIN32KBIN)\libconv.exe: kKrnlLib\tools\libconv.c
+    icc -Q+ -Ti+ -Fe$@ -Fo$(WIN32KOBJ)\$(*B).obj $**
 …
 #   MSC v6.0a compiler (cl.exe) (16-bit).
+#
+clfix.exe: clfix.c
+    $(CC) $(@B).c
+#
+# Make the symbol extract utillity - Extract.exe
+#
+# Extract object files.
+EXTRACTOBJS = \
+    $(WIN32KOBJ)\extract.obj_e \
+    $(WIN32KOBJ)\probkrnl.obj_e \
+    $(WIN32KOBJ)\d16globl.obj_e \
+    $(WIN32KOBJ)\vprntf16.obj_e
+# Rules to build Extract.exe.
+$(WIN32KBIN)\extract.exe: clfix.exe $(EXTRACTOBJS)
+    $(LD) $(LFLAGS) /pmtype:vio @<<$(WIN32KOBJ)\$(@B).lnk
+        /OUT:$@
+        /MAP:$(WIN32KBIN)\$(@B).map
+        $(EXTRACTOBJS)
+        $(TOOLKIT)\lib\os2286.lib
+        $(MSCPATH)\lib\clibcep.lib
+<<keep
+# Copy rule.
+extract.exe: $(WIN32KBIN)\extract.exe
+    $(CP) $** $@
+# Interference rule to make the Extract objects.
+{dev16}.c.obj_e:
+    @$(ECHO) compiling 16bit (extract): $<
+    @$(CC16) -c -W3 -Asfw -G2s -Zp -Zl -nologo -Fa -Zi -Od -Lp -DDEBUG -DEXTRACT \
+        -Fa$(WIN32KLIST)\$(*B)_e.s -Fo$(WIN32KOBJ)\$(@B).obj_e $(CINCLUDES16) $<
+$(WIN32KBIN)\clfix.exe: kKrnlLib\tools\clfix.c
+    icc -Q+ -Ti+ -Fe$@ -Fo$(WIN32KOBJ)\$(*B).obj $**

branches/splittup/src/win32k/win32k.tools.mk

-              r5944
+              r6841
 # $Id: win32k.tools.mk,v 1.10 2001-06-10 01:38:09 bird Exp $
+# $Id: win32k.tools.mk,v 1.10.2.1 2001-09-27 03:08:08 bird Exp $
+#
 …
 # IBM VisualAge for C++ v3.08 or IBM C/C++ Tools v3.6.5
+#
 CC16        = clfix.exe $(MSCPATH)\binp\cl.exe
+CC16        = $(WIN32KBIN)\clfix.exe $(MSCPATH)\binp\cl.exe
 CC          = icc
 CCPP        = icc
 …
+#
 !ifdef DEBUG
 CDEFINES    = -DWIN32K -DRING0 -D__WIN32OS2__ -D__WINE__ -DDEBUG
 CDEFINES16  = -DRING0    -DDEBUG
 ADEFINES    = -D:WIN32K -D:DEBUG
 !else
 CDEFINES    = -DWIN32K -DRING0 -D__WIN32OS2__ -D__WINE__ -DRELEASE
 CDEFINES16  = -DRING0    -DRELEASE
 ADEFINES    = -D:WIN32K -D:RELEASE
+CDEFINES    = -DWIN32K -DRING0 -D__WIN32OS2__ -D__WINE__ -DDEBUG $(CDEFINESEXTRA)
+CDEFINES16  = -DRING0    -DDEBUG $(CDEFINESEXTRA16)
+ADEFINES    = -D:WIN32K -D:DEBUG $(ADEFINESEXTRA)
+!else
+CDEFINES    = -DWIN32K -DRING0 -D__WIN32OS2__ -D__WINE__ -DRELEASE $(CDEFINESEXTRA)
+CDEFINES16  = -DRING0    -DRELEASE $(CDEFINESEXTRA16)
+ADEFINES    = -D:WIN32K -D:RELEASE $(ADEFINESEXTRA)
 !endif
 …
+#
 CINCLUDES  = -I$(WIN32KINCLUDE) \
+             -I$(KKRNLLIBINCLUDE) \
              -I$(TOOLKIT)\h \
              -I$(VACPATH)\include \
 …
 CINCLUDES16= -I$(WIN32KINCLUDE) \
+             -I$(KKRNLLIBINCLUDE) \
              -I. \
              -I$(DDKPATH)\h \
 …
 AINCLUDES  = -Fdi:$(WIN32KINCLUDE) \
+             -Fdi:$(KKRNLLIBINCLUDE) \
              -Fdi:$(DDKPATH)\inc
 …
+{Krnl}.asm{$(WIN32KOBJ)}.obj:
+    @$(ECHO) assembling Krnl:       $(SOURCEFILE)
+    @$(ASMCOMPILE)
+{Krnl}.asm.obj:
+    @$(ECHO) assembling Krnl:       $(SOURCEFILE)
+    @$(ASMCOMPILE)
+{Krnl}.c{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{Krnl}.c.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{Krnl}.c{$(WIN32KOBJ)}.obj_tst:
+    @$(ECHO) compiling 32bit Krnl tst: $(SOURCEFILE)
+    @$(CCOMPILE_TST)
+    @$(CP) $@ $@.obj
+{Krnl}.c.obj_tst:
+    @$(ECHO) compiling 32bit Krnl tst: $(SOURCEFILE)
+    @$(CCOMPILE_TST)
+    @$(CP) $@ $@.obj
+{Krnl}.cpp{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{Krnl}.cpp.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{clib}.asm{$(WIN32KOBJ)}.obj:
+    @$(ECHO) assembling Krnl:       $(SOURCEFILE)
+    @$(ASMCOMPILE)
+{clib}.asm.obj:
+    @$(ECHO) assembling Krnl:       $(SOURCEFILE)
+    @$(ASMCOMPILE)
+{clib}.c{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{clib}.c.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{clib}.c{$(WIN32KOBJ)}.obj_tst:
+    @$(ECHO) compiling 32bit Krnl tst: $(SOURCEFILE)
+    @$(CCOMPILE_TST)
+    @$(CP) $@ $@.obj
+{clib}.c.obj_tst:
+    @$(ECHO) compiling 32bit Krnl tst: $(SOURCEFILE)
+    @$(CCOMPILE_TST)
+    @$(CP) $@ $@.obj
+{clib}.cpp{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
+{clib}.cpp.obj:
+    @$(ECHO) compiling 32bit Krnl:  $(SOURCEFILE)
+    @$(CCOMPILE)
 {pe2lx}.c{$(WIN32KOBJ)}.obj:
     @$(ECHO) compiling 32bit pe2lx:  $(SOURCEFILE)
 …
+{testcase}.asm{$(WIN32KOBJ)}.obj:
+    @$(ECHO) assembling testcase:    $(SOURCEFILE)
+    @$(ASMCOMPILE_TST)
+{testcase}.asm.obj:
+    @$(ECHO) assembling testcase:    $(SOURCEFILE)
+    @$(ASMCOMPILE_TST)
+{testcase}.c{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit testcase: $(SOURCEFILE)
+    @$(CCOMPILE_TST_TEST)
+{testcase}.c.obj:
+    @$(ECHO) compiling 32bit testcase: $(SOURCEFILE)
+    @$(CCOMPILE_TST_TEST)
+{testcase}.cpp{$(WIN32KOBJ)}.obj:
+    @$(ECHO) compiling 32bit testcase: $(SOURCEFILE)
+    @$(CPPCOMPILE_TST_TEST)
+{testcase}.cpp.obj:
+    @$(ECHO) compiling 32bit testcase: $(SOURCEFILE)
+    @$(CPPCOMPILE_TST_TEST)

branches/splittup/src/win32k/win32k.vpj

-              r5247
+              r6841
 [COMPILER]
 MACRO=odin32_setcurrentdir();\nodin32_maketagfile();\n
 FILTEREXPANSION=0 1 0 0 0 0 0 0 0 0 0 1 1 0
 compile=concur|capture|clear|:Compile:&Compile,nmake -f win32k.mak .\bin\debug\%n.obj
+FILTEREXPANSION=1 1 0 0 1
+compile=concur|capture|clear|:Compile:&Compile,nmake .\bin\debug\%n.obj
 make=concur|capture|clear|:Build:&Build,nmake
 rebuild=concur|capture|clear|:Rebuild:&Rebuild,nmake -a
 …
 user2=hide|:User 2:User 2,
 usertool_resource_editor=hide|:Resource Editor:Resource Editor,dlgedit
 workingdir=..\..\src\win32k
 includedirs=include;..\..\include;..\..\include\win;%(INCLUDE)
+workingdir=G:\ODIN32\TREE\src\win32k
+includedirs=G:\ODIN32\TREE\src\win32k\include;G:\ODIN32\TREE\src\win32k\kKrnlLib\include;F:\toolkit\h;f:\ibmcpp\include;F:\ddk\base\h;F:\ddk\base\src\dev\dasd\diskh;.;G:\ODIN32\TREE\include;G:\ODIN32\TREE\include\win;%(INCLUDE)
 tagfiles=
 reffile=
-FILTERNAME=Dev16\nDev32\nLoader\nPe2Lx\nElf2Lx\nRexx\nMisc\nKernelStuff\nTest\nDef Files\nMakefiles\nLibrary\nk32\nOther Files\n
-FILTERPATTERN=d16*;prob*;symdb*;vprintf16*;dev16*;omf*;sym*\nd32*;dev*;calltab*\nldr*;my*;ModuleBase*\npe*;ModuleBas*\nElf*;ModuleBase*\nkRx*;ModuleBase*\nmalloc*;smallo*;rmall*;heap*;new*;vpr*;spr*;vspr*;yield*;str*;macros*;cout*;buffer*;avl*;asmutil*;log*;env*;option*;type*\nOS2K*;calltab*;probe*;d32ini*\ndh.asm;dos*;fake*;init.asm;win32ktst*;test*\n*.def\nmakefile*;*.mak;Check*;configure*\nlib*;win32k.h\nk32*\n*.*\n
-FILTERAPPCOMMAND=\n\n\n\n\n\n\n\n\n\n\n\n\n\n
-FILTERASSOCIATEFILETYPES=0 0 0 0 0 0 0 0 0 0 0 0 0 0
 [FILES]
 calltrees.txt
 Check.cmd
 Check.mk
-clfix.c
 configure.cmd
-dump
-fastdep.c
 history.txt
-libconv.c
 makedesc.cmd
 Makefile
+makefile
 Makefile.inc
 win32k.def
 …
 win32k.tools.mk
 win32k.txt
-Win32knew.def
 win32ktst.def
+..\..\include\win32k.h
+Xx2Lx.def
+Xx2Lx.mak
 api\api.cpp
 api\myVR32AllocMem.asm
 …
 dev16\d16init.c
 dev16\d16strat.c
-dev16\extract.c
-dev16\mkcalltab.c
-dev16\probkrnl.c
-dev16\SymDB.c
 dev16\vprntf16.c
+dev32\d32CallGate.asm
 dev32\d32ElfIOCtl.c
+dev32\d32Events.asm
 dev32\d32globals.c
 dev32\d32hlp.asm
 dev32\d32init.c
 dev32\d32Win32kIOCtl.c
+dev32\d32Win32kOpenClose.c
 dev32\devfirst.asm
 dev32\devlast.asm
 elf2lx\elf2lx.cpp
+elf2lx\elf2lx.def
 elf2lx\elf2lxmain.cpp
 elf2lx\elfdumper.cpp
 elf2lx\makefile
-k32\k32QuerySystemMemInfo.cpp
-test\AllocMem.c
-test\AllocMem.def
-test\AllocMem.mak
-test\invokelongexename.c
-test\longexecutablename..c
-test\longexecutablename..def
-test\longexecutablename.c
-test\longexecutablename.def
-test\longexecutablename.drv.c
-test\longexecutablename.drv.def
-test\makefile
-test\MemInfoTest.c
-test\MemInfoTest.def
-test\MemInfoTest.mak
 include\api.h
+include\api.inc
 include\asmutils.h
-include\avl.h
-include\cout.h
 include\dev16.h
 include\dev1632.h
 …
 include\dev32hlp.h
 include\devSegDf.h
 include\devsegdf.inc
+include\devSegDf.inc
 include\elf.h
 include\elf2lx.h
-include\env.h
-include\errors.h
 include\k32.h
 include\ldr.h
 include\locks.h
-include\log.h
-include\macros.h
-include\malloc.h
 include\ModuleBase.h
 include\myExecPgm.h
-include\new.h
 include\omf.h
 include\options.h
 include\options.inc
-include\OS2KIO.h
-include\OS2KLDR.h
-include\OS2KPG.h
-include\OS2KPTDA.h
-include\OS2Krnl.h
-include\OS2Krnl.inc
-include\OS2KSEC.h
-include\OS2KSEM.h
-include\OS2KSM.h
-include\OS2KTCB.h
-include\OS2KTK.h
-include\OS2KVM.h
 include\pe2lx.h
+include\probkrnl.h
+include\ptda.h
+include\rmalloc.h
+include\smalloc.h
+include\sprintf.h
+include\sym.h
+include\PerTaskW32kData.h
 include\test.h
-include\types.h
-include\vprintf.h
 include\vprntf16.h
 include\yield.h
+include\win32k.inc
 k32\k32AllocMemEx.cpp
+k32\k32HandleSystemEvent.cpp
+k32\k32KillProcessEx.cpp
 k32\k32ProcessReadWrite.cpp
+k32\k32QueryCallGate.cpp
 k32\k32QueryOptionsStatus.cpp
 k32\k32QueryOTEs.cpp
+k32\k32QuerySystemMemInfo.cpp
+k32\k32SendSystemEvent.cpp
+k32\k32SetEnvironment.cpp
 k32\k32SetOptions.cpp
+kKrnlLib\clib\abort.c
+kKrnlLib\clib\asmutils.asm
+kKrnlLib\clib\kAssert.c
+kKrnlLib\clib\kAVLBase.c.h
+kKrnlLib\clib\kAVLDoWithAll.c.h
+kKrnlLib\clib\kAVLEnum.c.h
+kKrnlLib\clib\kAVLGet.c.h
+kKrnlLib\clib\kAVLGet2.c.h
+kKrnlLib\clib\kAVLGetBestFit.c.h
+kKrnlLib\clib\kAVLGetWithAdjacentNodes.c.h
+kKrnlLib\clib\kAVLGetWithParent.c.h
+kKrnlLib\clib\kAVLPV.c
+kKrnlLib\clib\kAVLRemove2.c.h
+kKrnlLib\clib\kAVLRemoveBestFit.c.h
+kKrnlLib\clib\kAVLStr.c
+kKrnlLib\clib\kAVLStrI.c
+kKrnlLib\clib\kAVLULM.c
+kKrnlLib\clib\malloc.c
+kKrnlLib\clib\new.cpp
+kKrnlLib\clib\rmalloc.c
+kKrnlLib\clib\smalloc.c
+kKrnlLib\clib\stricmp.c
+kKrnlLib\clib\vprintf.c
+kKrnlLib\clib\vsprintf.c
+kKrnlLib\dev32\Extract32.c
+kKrnlLib\include\dev16.h
+kKrnlLib\include\dev1632.h
+kKrnlLib\include\dev32.h
+kKrnlLib\include\dev32hlp.h
+kKrnlLib\include\devSegDf.h
+kKrnlLib\include\devSegDf.inc
+kKrnlLib\include\env.h
+kKrnlLib\include\kAssert.h
+kKrnlLib\include\kAVL.h
+kKrnlLib\include\kKLasmutils.h
+kKrnlLib\include\kKLavl.h
+kKrnlLib\include\kKLFunc.h
+kKrnlLib\include\kKLInitHlp.h
+kKrnlLib\include\kKLlog.h
+kKrnlLib\include\kKLmalloc.h
+kKrnlLib\include\kKLnew.h
+kKrnlLib\include\kKLprintf.h
+kKrnlLib\include\kKLrmalloc.h
+kKrnlLib\include\kKLsmalloc.h
+kKrnlLib\include\kKLsprintf.h
+kKrnlLib\include\kKrnlLib.h
+kKrnlLib\include\krnlPrivate.h
+kKrnlLib\include\kTypes.h
+kKrnlLib\include\omf.h
+kKrnlLib\include\options.h
+kKrnlLib\include\options.inc
+kKrnlLib\include\OS2KIO.h
+kKrnlLib\include\OS2KLDR.h
+kKrnlLib\include\OS2KOwn.h
+kKrnlLib\include\OS2KPG.h
+kKrnlLib\include\OS2KPTDA.h
+kKrnlLib\include\OS2Krnl.h
+kKrnlLib\include\OS2KSEC.h
+kKrnlLib\include\OS2KSEL.h
+kKrnlLib\include\OS2KSEM.h
+kKrnlLib\include\OS2KSM.h
+kKrnlLib\include\OS2KTCB.h
+kKrnlLib\include\OS2KTK.h
+kKrnlLib\include\OS2KVM.h
+kKrnlLib\include\ProbKrnl.h
+kKrnlLib\include\ProbKrnlErrors.h
+kKrnlLib\include\sym.h
+kKrnlLib\include\testcase.h
+kKrnlLib\include\vprntf16.h
+kKrnlLib\krnl\env.c
+kKrnlLib\krnl\krnlInit.c
+kKrnlLib\krnl\krnlLockedWrite.asm
+kKrnlLib\krnl\krnlOverloading.c
+kKrnlLib\krnl\krnlPrologs.c
+kKrnlLib\krnl\krnlStubs.c
+kKrnlLib\krnl\OS2KPTDA.c
+kKrnlLib\krnl\OS2KTCB.c
+kKrnlLib\testcase\DH.asm
+kKrnlLib\testcase\Dos.c
+kKrnlLib\testcase\DosA.asm
+kKrnlLib\testcase\Fake.c
+kKrnlLib\testcase\FakeA.asm
+kKrnlLib\testcase\Init.asm
+kKrnlLib\testcase\kKrnlLibTst.c
+kKrnlLib\testcase\TstFakers.c
+kKrnlLib\tools\clfix.c
+kKrnlLib\tools\libconv.c
+ldr\calltaba.asm
 ldr\ldr.cpp
 ldr\ModuleBase.cpp
 …
 ldr\myldrFindModule.cpp
 ldr\myldrGetFileName.asm
+ldr\myLDRGetProcAddr.cpp
 ldr\myldrOpen.cpp
 ldr\myldrOpenPath.cpp
 …
 ldr\myldrRead.cpp
 ldr\myldrSetVMflags.cpp
+ldr\myldrWasLoadModuled.cpp
 ldr\mytkExecPgm.asm
 ldr\mytkStartProcess.asm
 ldr\myVMAllocMem.cpp
+ldr\xx2lxmain.cpp
+lib\libCallThruCallGate.asm
 lib\libDosAllocMemEx.c
+lib\libDosKillProcessEx.c
 lib\libGetCS.asm
 lib\libInit.c
+lib\libPrivate.h
 lib\libTerm.c
 lib\libTest.c
+lib\libW32kHandleSystemEvent.c
 lib\libW32kProcessReadWrite.c
 lib\libW32kQueryOTEs.c
+lib\libW32kQuerySystemMemInfo.c
 lib\libWin32kInstalled.c
 lib\libWin32kQueryOptionsStatus.c
+lib\libWin32kSetEnvironment.c
 lib\libWin32kSetOptions.c
 lib\makefile
 …
 misc\OS2KPTDA.c
 misc\OS2KTCB.c
+misc\PerTaskW32kData.c
 misc\ptda.c
 misc\rmalloc.c
 …
 misc\yield.c
 mmf\mmf.cpp
+mmf\stderr
+mmf\stdout
 pe2lx\makefile
 pe2lx\pe2lx.cpp
+pe2lx\pe2lx.def
 pe2lx\pe2lxmain.cpp
 rexx\kRx.c
 …
 rexx\kRxa.asm
 rexx\makefile
+rexx\tst.asm
 rexx\tst.cmd
+test\AllocMem.c
+test\AllocMem.def
+test\AllocMem.mak
 test\dh.asm
 test\dos.c
 test\dosa.asm
+test\DosAllocMemEx.c
+test\DosAllocMemEx.def
+test\DosAllocMemEx.mak
 test\fake.c
 test\fakea.asm
 test\init.asm
+test\invokelongexename.c
+test\longexecutablename
+test\longexecutablename..c
+test\longexecutablename..def
+test\longexecutablename.c
+test\longexecutablename.def
+test\longexecutablename.drv.c
+test\longexecutablename.drv.def
+test\makefile
+test\MemInfoTest.c
+test\MemInfoTest.def
+test\MemInfoTest.mak
+test\ole
+test\PrfTstProcess.c
+test\PrfTstProcess.def
+test\PrfTstProcess.mak
 test\TestKernels.cmd
+test\tst3
 test\TstProcessReadWrite.c
 test\win32ktst.c
+test\Zombie.c
+test\Zombie.def
+test\Zombie.mak
+test\test\64alloc.c
+utils\Dialog.h
 utils\makefile
 utils\Win32kCC.c
+utils\Win32kCC.def
 utils\Win32kCC.dlg
 utils\Win32kCC.h
 utils\Win32kCC.rc
+utils\test\Dialog.h
+utils\test\Win32kCC.c
+utils\test\WIN32KCC.dlg
 [ASSOCIATION]
 [STATE]
 SCREEN: 1600 1200 -250 255 1244 800 0 0 M 0 0 0 0 1247 855
 CWD: G:\odin32\tree\src\win32k
+SCREEN: 1792 1344 5 2 1194 1330 0 0 N 0 0 0 0 927 950
+CWD: G:\odin32\tree\src\win32k\kKrnlLib
 BUFFER: BN="F:\VSLICK40\OS2\vrestore.slk"
 BI: MA=1 254 1  TABS=1 9  WWS=3 IWT=0 ST=0 IN=0 BW=0 US=0 RO=0 SE=0 SN=0 BIN=0 MN=Fundamental   HM=0 MF=1
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=21 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32ElfIOCtl.c"
+BI: MA=1 74 1  TABS=1 9  WWS=1 IWT=0 ST=0 IN=2 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=C  HM=0 MF=0
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=26 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32Events.asm"
+BI: MA=1 74 1  TABS=1 5  WWS=1 IWT=0 ST=0 IN=1 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=Assembly   HM=0 MF=0
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=25 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32globals.c"
+BI: MA=1 74 1  TABS=1 9  WWS=1 IWT=0 ST=0 IN=2 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=C  HM=0 MF=0
 VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=24 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\odin32\tree\src\win32k\dev32\d32Events.asm"
+BI: MA=1 74 1  TABS=1 5  WWS=1 IWT=0 ST=0 IN=1 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=Assembly   HM=0 MF=864
+VIEW: LN=.4055 CL=36 LE=0 CX=35 CY=21 WI=5 BI=17 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\odin32\tree\src\win32k\win32k.mak"
+BI: MA=1 74 1  TABS=1 5  WWS=1 IWT=0 ST=0 IN=2 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=   HM=0 MF=512
+VIEW: LN=.3660 CL=5 LE=0 CX=4 CY=21 WI=5 BI=23 HT=0 HN=0 HF=0 HC=4
+WINDOW: 52 54 841 577 -1 -1 M  WF=0 WT=2 "System Monospaced,10,0,1"
+BUFFER: BN="G:\odin32\tree\src\win32k\dev32\d32Events.asm"
+VIEW: LN=.4055 CL=36 LE=0 CX=35 CY=21 WI=83 BI=17 HT=0 HN=0 HF=0 HC=4
+WINDOW: 0 0 841 577 -1 -1 M  WF=0 WT=1 "System Monospaced,10,0,1"
+BUFFER: BN="G:\odin32\tree\src\win32k\win32k.mak"
+VIEW: LN=.3659 CL=4 LE=0 CX=3 CY=21 WI=85 BI=23 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32hlp.asm"
+BI: MA=1 74 1  TABS=1 5  WWS=1 IWT=0 ST=0 IN=1 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=Assembly   HM=0 MF=0
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=5 BI=4 HT=0 HN=0 HF=0 HC=4
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32init.c"
+BI: MA=1 74 1  TABS=1 9  WWS=1 IWT=0 ST=0 IN=2 BW=0 US=32000 RO=0 SE=1 SN=0 BIN=0 MN=C  HM=0 MF=608
+VIEW: LN=.934 CL=21 LE=0 CX=20 CY=27 WI=5 BI=27 HT=0 HN=0 HF=0 HC=4
+WINDOW: 260 270 625 641 -1 -1 M  WF=0 WT=1 "System Monospaced,10,0,1"
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32ElfIOCtl.c"
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=84 BI=26 HT=0 HN=0 HF=0 HC=4
+WINDOW: 286 297 625 641 -1 -1 M  WF=0 WT=3 "System Monospaced,10,0,1"
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32Events.asm"
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=83 BI=25 HT=0 HN=0 HF=0 HC=4
+WINDOW: 0 0 625 641 -1 -1 M  WF=0 WT=4 "System Monospaced,10,0,1"
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32globals.c"
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=134 BI=24 HT=0 HN=0 HF=0 HC=4
+WINDOW: 26 27 625 641 -1 -1 M  WF=0 WT=5 "System Monospaced,10,0,1"
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32hlp.asm"
+VIEW: LN=.0 CL=1 LE=0 CX=0 CY=1 WI=102 BI=4 HT=0 HN=0 HF=0 HC=4
+WINDOW: 52 54 625 641 -1 -1 M  WF=0 WT=6 "System Monospaced,10,0,1"
+BUFFER: BN="G:\ODIN32\TREE\src\win32k\dev32\d32init.c"
+VIEW: LN=.934 CL=21 LE=0 CX=20 CY=27 WI=96 BI=27 HT=0 HN=0 HF=0 HC=4
 FILEHIST: 9
 G:\odin32\tree\src\win32k\dev32\d32CallGate.asm
 G:\odin32\tree\src\win32k\include\k32.h
 G:\odin32\tree\src\win32k\k32\k32HandleSystemEvent.cpp
 G:\odin32\tree\src\win32k\ldr\myldrGetFileName.asm
 G:\odin32\tree\src\win32k\ldr\myldrOpenPatha.asm
 G:\odin32\tree\src\win32k\ldr\mytkExecPgm.asm
 G:\odin32\tree\src\win32k\ldr\mytkStartProcess.asm
 G:\odin32\tree\src\win32k\ldr\calltaba.asm
 G:\odin32\tree\src\win32k\win32k.mak
+G:\ODIN32\TREE\src\win32k\dev32\d32Events.asm
+G:\ODIN32\TREE\src\win32k\dev32\d32globals.c
+G:\ODIN32\TREE\src\win32k\dev32\d32hlp.asm
+G:\ODIN32\TREE\src\win32k\dev32\d32init.c
+G:\ODIN32\TREE\src\win32k\dev32\d32Win32kIOCtl.c
+G:\ODIN32\TREE\src\win32k\dev32\d32Win32kOpenClose.c
+G:\ODIN32\TREE\src\win32k\dev32\devfirst.asm
+G:\ODIN32\TREE\src\win32k\dev32\devlast.asm
+G:\odin32\tree\src\win32k\kKrnlLib\dev32\d32init.c
 PRINTER: 2
+PRINTER: 2
 Printer1,
+,

Context Navigation

Legend:

Download in other formats: