Changeset 6740 for trunk/src

Timestamp:

Sep 17, 2001, 4:27:56 AM (24 years ago)

Author:

bird

Message:

Bugfixing.

Location:

trunk/src/win32k/kKrnlLib

Files:

• Makefile (modified) (3 diffs)
• include/kKLInitHlp.h (modified) (2 diffs)
• testcase/DH.asm (modified) (3 diffs)
• testcase/DosA.asm (modified) (4 diffs)

trunk/src/win32k/kKrnlLib/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.7 2001-09-17 01:47:35 bird Exp $
+# $Id: Makefile,v 1.8 2001-09-17 02:27:54 bird Exp $
 
 #
@@ -154 +154 @@
     $(WIN32KOBJ)\d16globl.obj \
     $(WIN32KOBJ)\calltaba.obj \
-    $(WIN32KOBJ)\krnlInit.obj \
+    $(WIN32KOBJ)\krnlInit.obj_tst. \
     $(WIN32KOBJ)\krnlLockedWrite.obj \
     $(WIN32KOBJ)\krnlOverloading.obj \
@@ -247 +247 @@
 # List of object files in the converted devhelp library.
 DHLPOBJS =  +$(WIN32KOBJ)\dhcall5b.obj +$(WIN32KOBJ)\dhcal11a.obj \
-            +$(WIN32KOBJ)\dhcal11g.obj +$(WIN32KOBJ)\dhret.obj
+            +$(WIN32KOBJ)\dhcal11g.obj +$(WIN32KOBJ)\dhret.obj \
+            +$(WIN32KOBJ)\dhcall2e.obj
 
 # Make corrected devhelp library with only the required object files.

trunk/src/win32k/kKrnlLib/include/kKLInitHlp.h

@@ -1 @@
-/* $Id: kKLInitHlp.h,v 1.2 2001-09-11 01:27:28 bird Exp $
+/* $Id: kKLInitHlp.h,v 1.3 2001-09-17 02:27:55 bird Exp $
  *
  * Definition of the R0 initiation helper IOCtl interface.
@@ -17 +17 @@
  * Ring 0 init helper IOCtl
  */
-#define KKL_DEVICE_NAME             "kKrnlHlp"
+#define KKL_DEVICE_NAME             "\\dev\\kKrnlHlp"
 #define KKL_IOCTL_CAT               0xC1
 #define KKL_IOCTL_RING0INIT         0x42

trunk/src/win32k/kKrnlLib/testcase/DH.asm

@@ -1 @@
-; $Id: DH.asm,v 1.1 2001-09-17 01:41:12 bird Exp $
+; $Id: DH.asm,v 1.2 2001-09-17 02:27:55 bird Exp $
 ;
 ; Device Helper Router.
@@ -110 +110 @@
 
 dhr6:
+    cmp     dl, DevHlp_VerifyAccess
+    jne     dhr7
+    call    dh_VerifyAccess
+    jmp     dhr_ret
+
+dhr7:
 
 dhr_notimplemented:
@@ -501 +507 @@
 
 
+;;
+; VerifyAccess stub.
+; @returns  NO_ERROR. (0)
+; @param    ignored.
+; @uses     eax
+; @status   stub.
+; @author   knut st. osmundsen (knut.stange.osmundsen@pmsc.no)
+dh_VerifyAccess PROC NEAR
+    xor     eax, eax
+    clc
+    ret
+dh_VerifyAccess ENDP
+
+
 CODE16 ENDS
 

trunk/src/win32k/kKrnlLib/testcase/DosA.asm

@@ -1 @@
-; $Id: DosA.asm,v 1.1 2001-09-17 01:41:12 bird Exp $
+; $Id: DosA.asm,v 1.2 2001-09-17 02:27:56 bird Exp $
 ;
 ; 16-bits Dos calls overloader
@@ -14 +14 @@
 ;
     include devsegdf.inc
+    INCL_DOSERRORS EQU 1
     include os2.inc
     include devsym.inc
@@ -105 +106 @@
     cmp     eax, 'lHln'                 ; 'nlHl'
     jnz     do_notkKrnlHlp
-    mov     eax, ds:[ebx+8]
+    mov     eax, ds:[ebx+0ch]
     cmp     ax, 'p'                     ; 'p\0'
     jnz     do_notkKrnlHlp
@@ -141 +142 @@
     pop     bx
     pop     ds
+    mov     ax, ERROR_FILE_NOT_FOUND
     leave
     ret     01ah