Changeset 1467 for trunk/src/win32k/dev32

Timestamp:

Oct 27, 1999, 4:03:01 AM (26 years ago)

Author:

bird

Message:

Corrections to make win32k work.
(And now it does work, at least at my test machine...)

Location:

trunk/src/win32k/dev32

Files:

• d32globals.c (modified) (2 diffs)
• d32hlp.asm (modified) (1 diff)
• d32init.c (modified) (19 diffs)
• devfirst.asm (modified) (9 diffs)
• devlast.asm (modified) (3 diffs)

trunk/src/win32k/dev32/d32globals.c

@@ -1 @@
-/* $Id: d32globals.c,v 1.1 1999-09-06 02:19:56 bird Exp $
+/* $Id: d32globals.c,v 1.2 1999-10-27 02:02:53 bird Exp $
  *
  * d32globals - global data (32-bit)
@@ -21 +21 @@
 *   Global Variables                                                           *
 *******************************************************************************/
-ULONG           TKSSBase32;
+PULONG          pulTKSSBase32;
 struct options  options;
 

trunk/src/win32k/dev32/d32hlp.asm

@@ -1 @@
-; $Id: d32hlp.asm,v 1.1 1999-09-06 02:19:56 bird Exp $
+; $Id: d32hlp.asm,v 1.2 1999-10-27 02:02:54 bird Exp $
 ;
 ; d32hlp - 32-bit Device Driver Helper Function.
 ;
 ; Copyright (c) 1999 knut st. osmundsen
+;
+; Project Odin Software License can be found in LICENSE.TXT
 ;
     .386p

trunk/src/win32k/dev32/d32init.c

@@ -1 @@
-/* $Id: d32init.c,v 1.1 1999-09-06 02:19:56 bird Exp $
+/* $Id: d32init.c,v 1.2 1999-10-27 02:02:54 bird Exp $
  *
  * d32init.c - 32-bits init routines.
@@ -12 +12 @@
 #define MAXSIZE_PROLOG 0x10             /* Note that this must be synced with */
                                         /* the one used in calltab.asm.       */
+#define static
 
 #define INCL_DOSERRORS
@@ -31 +32 @@
 #include "log.h"
 #include "asmutils.h"
-#include "cout.h"
 #include "malloc.h"
 #include "ldr.h"
@@ -58 +58 @@
  * @returns   Status word.
  * @param     pRpInit  Pointer init request packet.
+ * @sketch    Set TKSSBase32.
+ *            Set default parameters.
+ *            Parse command line options.
+ *            Show (kprint) configuration.
+ *            Init heap.
+ *            Init ldr.
+ *            Init procs. (overloaded ldr procedures)
+ * @status    completely implemented.
+ * @author    knut st. osmundsen
  */
 USHORT _loadds _Far32 _Pascal R0Init32(RP32INIT *pRpInit)
@@ -64 +73 @@
     char *pszTmp;
 
-    TKSSBase32 = _TKSSBase16;
+    pulTKSSBase32 = (PULONG)_TKSSBase16;
 
     SET_OPTIONS_TO_DEFAULT(options);
@@ -80 +89 @@
         switch (*pszTmp)
         {
-            case 'C': /* -C[1|2] - com-port no */
+            case 'C': /* -C[1|2] - com-port no, def:-C2 */
                 switch (pszTmp[1])
                 {
@@ -86 +95 @@
                         options.usCom = OUTPUT_COM1;
                         break;
+
                     case '2':
+                    default:
                         options.usCom = OUTPUT_COM2;
-                        break;
                 }
                 break;
 
-            case 'L': /*-L:[Y|N or ]*/
+            case 'L': /* -L[..]<:|=| >[<Y..|E..| > | <N..|D..>] */
                 pszTmp2 = strpbrk(pszTmp, ":=/- ");
-                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1 && (*pszTmp2 == '=' || *pszTmp2 == ':' || *pszTmp2 == ' ' && (pszTmp2[1] != '-' || pszTmp2[1] != '/')))
-                {
-                    switch (pszTmp2[1])
-                    {
-                        case 'D': /*disable*/
-                            options.fLogging = FALSE;
-                            break;
-                        case 'E': /*enable*/
-                            options.fLogging = TRUE;
-                            break;
-                        case 'Y': /*yes*/
-                            options.fLogging = TRUE;
-                            break;
-                        case 'N': /*no*/
-                            options.fLogging = FALSE;
-                            break;
-                    }
-                }
+                if (pszTmp2 != NULL && (int)(pszTmp2-pszTmp) < cch-1
+                    && (pszTmp2[1] == 'N' ||pszTmp2[1] == 'n' || pszTmp2[1] == 'D' || pszTmp2[1] == 'd')
+                    )
+                    options.fLogging = FALSE;
                 else
                     options.fLogging = TRUE;
@@ -126 +122 @@
 
             case 'V': /* verbose initialization */
-                options.fQuiet = TRUE;
+                options.fQuiet = FALSE;
                 break;
 
@@ -164 +160 @@
      * init sub-parts
      */
-
     /* heap */
     if (heapInit(HEAP_SIZE) != NO_ERROR)
         return STATUS_DONE | STERR | ERROR_I24_QUIET_INIT_FAIL;
-
-    /* cout init */
-    coutInit(options.usCom);
 
     /* loader */
@@ -201 +193 @@
         {
             kprintf(("VerifyProcTab32: procedure no.%d was not found!\n", i));
-            return 1;
-        }
-
-        /* verify read/writeable. - NOT IMPLEMENTED (yet) */
+            return STATUS_DONE | STERR | 1;
+        }
+
+        /* verify read/writeable. - FIXME */
+        if (_aProcTab[i].ulAddress < 0xffe00000UL)
+        {
+            kprintf(("VerifyProcTab32: procedure no.%d has an invlalid address, %#08x!\n",
+                     i, _aProcTab[i].ulAddress));
+            return STATUS_DONE | STERR | 2;
+        }
 
         /* verify known function prolog. (only EPT_PROC) */
@@ -212 +210 @@
             {
                 kprintf(("VerifyProcTab32: verify failed for procedure no.%d\n",i));
-                return 2;
+                return STATUS_DONE | STERR | 3;
             }
         }
@@ -218 +216 @@
         {
             kprintf(("VerifyProcTab32: only EPT_PROC is implemented\n",i));
-            return 3;
-        }
-    }
-
-    return 0;
+            return STATUS_DONE | STERR | 4;
+        }
+    }
+
+    return STATUS_DONE;
 }
 
@@ -228 +226 @@
 /**
  * Get kernel OTEs
- * @returns   0 if ok. !0 on failiure.
+ * @returns   Strategy return code:
+ *            STATUS_DONE on success.
+ *            STATUS_DONE | STERR | errorcode on failure.
  * @param     pOTEBuf  Pointer to output buffer.
+ * @status    completely implemented and tested.
+ * @author    knut st. osmundsen
  * @remark    Called from IOCtl.
  */
@@ -271 +273 @@
         kprintf(("GetOTEs32: failed. usRc = %d\n", usRc));
 
-    return usRc;
+    return usRc | (usRc != 0 ? STATUS_DONE | STERR : STATUS_DONE);
 }
 
@@ -292 +294 @@
      *     push ebp
      *     mov ebp,esp
+     *  or
+     *     push ebp
+     *     mov ecx, dword ptr [123407452]
      */
 
-    if (p[0] == 0x55 && p[1] == 0x8b && p[2] == 0xec)
-    {
-        rc = 3;
+    if (p[0] == 0x55 && p[1] == 0x8b)
+    {
+        if (p[2] == 0xec)
+            rc = 3;
+        else
+            rc = 1;
         while (rc < 5)
         {
@@ -308 +316 @@
                 case 0x33: /* xor (ldrClose, ldrOpen) */
                     rc +=2;
+                    break;
+                case 0x8b:
+                    if (p[rc+1] == 0x0d)
+                        rc += 6;
+                    else
+                        rc += 2; /*????!*/
                     break;
                 case 0x8d: /* lea (ldrRead) */
@@ -341 +355 @@
     for (i = 0; i < NUMBER_OF_PROCS; i++)
     {
-        if ((cb = interpretFunctionProlog((char*)_aProcTab[i].ulAddress)) <= 0 && cb + 5 >= MAXSIZE_PROLOG)
-        {
-            kprintf(("rehookFunctions: verify failed for procedure no.%d\n", i));
+        cb = interpretFunctionProlog((char*)_aProcTab[i].ulAddress);
+        if (cb <= 0 || cb + 5 >= MAXSIZE_PROLOG)
+        {
+            kprintf(("rehookFunctions: verify failed for procedure no.%d, cb=%d\n", i, cb));
             return 1;
         }
@@ -369 +384 @@
 
             /* copy function prolog */
-            memcpy(callTab[i], (char*)_aProcTab[i].ulAddress, cb);
+            memcpy(callTab[i], (void*)_aProcTab[i].ulAddress, (size_t)cb);
 
             /* jump from calltab to original function */
@@ -386 +401 @@
             return 1;
         }
-        i++;
     }
 

trunk/src/win32k/dev32/devfirst.asm

@@ -1 @@
-; $Id: devfirst.asm,v 1.1 1999-09-06 02:19:56 bird Exp $
+; $Id: devfirst.asm,v 1.2 1999-10-27 02:02:54 bird Exp $
 ;
 ; DevFirst - entrypoint and segment definitions
@@ -5 +5 @@
 ; Copyright (c) 1999 knut st. osmundsen
 ;
+; Project Odin Software License can be found in LICENSE.TXT
 ;
     .386p
@@ -12 +13 @@
 ;
     include devsegdf.inc
+    include sas.inc
 
 ;
@@ -29 +31 @@
     public _strategyAsm0
     public _strategyAsm1
+    public _CallGetOTEs32
     public _SSToDS_16a
+    public GetOS2KrnlMTE
 
 
@@ -35 +39 @@
 ; Externs
 ;
+    extrn _TKSSBase16:dword
+    extrn GETOTES32:FAR
+    .286p
     extrn _strategy:near
-    extrn CODE16END:byte
-    extrn DATA16END:byte
-    extrn _TKSSBase16:dword
 
 
@@ -46 +50 @@
 CODE16START label byte
 
+    .286p
 ;$win32ki entry point
 _strategyAsm0:
@@ -56 +61 @@
     jmp     _strategyAsm
 
+;;
+; Stub which pushes parameters onto the stack and call the 16-bit C strategy routine.
+; @returns   returns the return value of strategy(...)
+; @author    knut st. osmundsen
 _strategyAsm proc far
     push    es
@@ -66 +75 @@
     mov     word ptr es:[bx+3], ax
     add     sp, 2
-;    int 3
     retf
 _strategyAsm endp
 
 
-;extern LIN   SSToDS_16a(void NEAR *pStackVar);
+    .386p
+;;
+; Thunk procedure for R0Init32.
+; @cproto    USHORT NEAR CallGetOTEs32(ULONG addressOTEBuf);
+; @returns   Same as GetOTEs32.
+; @param     addressOTEBuf  32-bit pointer to request data.
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallGetOTEs32 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:GETOTES32
+    pop     ds
+    retn
+_CallGetOTEs32 ENDP
+
+
+;;
+; SSToDS - stack pointer to Flat pointer.
+; @cproto    extern LIN   SSToDS_16a(void NEAR *pStackVar);
+; @returns   ax:dx  makes up a 32-bit flat pointer to stack.
+; @param     pStackVar  Stack pointer which is to be made a flat pointer.
+; @equiv     SSToDS in 32-bit code.
+; @sketch    Get Flat CS
+;            Get TKSSBase address. (FLAT)
+;            return *TKSSBase + pStackVar.
+; @status    completely  implemented.
+; @author    knut st. osmundsen
+; @remark    es is cs, not ds!
 _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
-    jmp far ptr FLAT:_SSToDS_16a_GetFLAT_32
-_SSToDS_16a_GetFLAT_16::
-    mov     edx, ds:_TKSSBase16
-    movzx   eax, word ptr ss:[esp + 4]
-    add     eax, es:[edx]
+    mov     es,  ax
+    assume  es:FLAT
+    mov     eax, es:[edx]               ; get pointer to stack base
+    pop     es
+    movzx   edx, word ptr ss:[esp + 2]  ; 16-bit stack pointer (parameter)
+    add     eax, edx                    ; 32-bit stack pointer in eax
     mov     edx, eax
-    shr     edx, 16
-    pop     es
+    shr     edx, 16                     ; dx high 16-bit of 32-bit stack pointer.
     ret
 _SSToDS_16a endp
@@ -88 +128 @@
 CODE16 ends
 
+
+;
+; all segments have a <segmentname>START label at the start of the segment.
+;
+
 CODE32 segment
 CODE32START label byte
-    ASSUME CS:CODE32
-_SSToDS_16a_GetFLAT_32:
-    push    cs
-    pop     es
-    jmp far ptr CODE16:_SSToDS_16a_GetFLAT_16
+
+;;
+; Gets the current cs.
+; @cproto    none.
+; @returns   CS
+; @author    knut st. osmundsen
+; @remark    internal method. called from 16-bit code...
+far_getCS proc far
+    ASSUME DS:nothing, ES:nothing
+    mov     ax,  cs
+    retf
+far_getCS endp
+
+
+
+;;
+; Gets the a 32-bit flat pointer to the OS/2 Kernel MTE.
+; @cproto    extern PMTE _System GetOS2KrnlMTE(void);
+; @returns   Pointer to kernel MTE.
+; @status    completely implemented.
+; @author    knut st. osmundsen
+GetOS2KrnlMTE PROC NEAR
+    push    es
+
+    mov     ax,  SAS_selector               ;70h - Read-only SAS selector.
+    mov     es,  ax
+    xor     ebx, ebx
+    assume  ebx: PTR SAS
+    mov     bx,  es:[ebx].SAS_vm_data       ;SAS_vm_data (0ch)
+    assume  ebx: PTR SAS_vm_section
+    mov     eax, es:[ebx].SAS_vm_krnl_mte   ;SAS_vm_krnl_mte (0ch)
+
+    pop     es
+    ret
+GetOS2KrnlMTE ENDP
 
 CODE32 ends
 
 
-;
-; all segments have a <segmentname>START label at the start of the segment.
-;
 DATA16 segment
 DATA16START label byte

trunk/src/win32k/dev32/devlast.asm

@@ -1 @@
-; $Id: devlast.asm,v 1.1 1999-09-06 02:19:56 bird Exp $
-; DevLast - the last object file which is resident all the time.
-; Object files which are linked in after this is discarded after init.
+; $Id: devlast.asm,v 1.2 1999-10-27 02:02:54 bird Exp $
+;
+; DevLast - the object file termintating the resident part of the objects.
+; Code after the ???END labes and object files and which are linked in
+; after this file is discarded after init.
 ;
 ; Copyright (c) 1999 knut st. osmundsen
 ;
+; Project Odin Software License can be found in LICENSE.TXT
 ;
        .model flat
@@ -28 +31 @@
     public CONST32_ROEND
     public _CallR0Init32
-
+    public _CallVerifyProcTab32
 
 
@@ -49 +52 @@
 
 extrn R0INIT32:FAR
+extrn VERIFYPROCTAB32:FAR
 
 CODE16 segment
-    ASSUME CS:CODE16
 CODE16END db ?
 
-
+;;
+; 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
     push    ds
-    push    word ptr [esp+4]
-    push    word ptr [esp+8]
+    push    word ptr [esp+6]            ; push high word.
+    push    word ptr [esp+6]            ; push low word.
     call    far ptr FLAT:R0INIT32
     pop     ds
     retn
 _CallR0Init32 ENDP
+
+
+;;
+; Thunk procedure for VerifyProcTab32.
+; @cproto    USHORT NEAR CallVerifyProcTab32(void);
+; @returns   Same as VerifyProcTab32.
+; @status    completely implemented.
+; @author    knut st. osmundsen
+_CallVerifyProcTab32 PROC NEAR
+    ASSUME CS:CODE16
+    push    ds
+    call    far ptr FLAT:VERIFYPROCTAB32
+    pop     ds
+    retn
+_CallVerifyProcTab32 ENDP
+
 CODE16 ends
+
 
 CODE32 segment