Changeset 5247 for trunk/src/win32k/ldr

Timestamp:

Feb 23, 2001, 3:57:55 AM (25 years ago)

Author:

bird

Message:

Calltable fixes. Handle event. New 14062e kernels.

Location:

trunk/src/win32k/ldr

Files:

• myldrGetFileName.asm (modified) (2 diffs)
• myldrOpenPatha.asm (modified) (3 diffs)
• mytkExecPgm.asm (modified) (10 diffs)
• mytkStartProcess.asm (modified) (6 diffs)

trunk/src/win32k/ldr/myldrGetFileName.asm

@@ -1 @@
-; $Id: myldrGetFileName.asm,v 1.1 2000-12-11 06:33:00 bird Exp $
+; $Id: myldrGetFileName.asm,v 1.2 2001-02-23 02:57:54 bird Exp $
 ;
 ; myldrGetFileName2 - assembly helper for ldrGetFileName.
@@ -61 +61 @@
     push    dword ptr [esp + 0ch]
     push    dword ptr [esp + 0ch]
-    call    near ptr FLAT:CALLTAB:_ldrGetFileName@12
+    call    _ldrGetFileName@12
 
     ;

trunk/src/win32k/ldr/myldrOpenPatha.asm

@@ -1 @@
-; $Id: myldrOpenPatha.asm,v 1.4 2000-10-01 02:58:19 bird Exp $
+; $Id: myldrOpenPatha.asm,v 1.5 2001-02-23 02:57:54 bird Exp $
 ;
 ; myldrOpenPatha - assembly helpers for myldrOpenPath.
@@ -63 +63 @@
     push    dword ptr [esp + 10h]
     push    dword ptr [esp + 10h]
-    call    near ptr FLAT:CALLTAB:_ldrOpenPath_wrapped
+    call    _ldrOpenPath_wrapped
     ret     14h
 endif
@@ -95 +95 @@
 
 new:
-    jmp     near ptr FLAT:CALLTAB:_ldrOpenPath_wrapped
+    jmp     _ldrOpenPath_wrapped
 _ldrOpenPath@20 ENDP
 

trunk/src/win32k/ldr/mytkExecPgm.asm

@@ -1 @@
-; $Id: mytkExecPgm.asm,v 1.12 2000-10-01 02:58:19 bird Exp $
+; $Id: mytkExecPgm.asm,v 1.13 2001-02-23 02:57:55 bird Exp $
 ;
 ; mytkExecPgm - tkExecPgm overload
@@ -176 +176 @@
     mov     di, dx                      ; bx:di is now filename address
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:f_FuStrLen
+    call    f_FuStrLen                  ; NB/TODO/FIXME: this is a 16-bit call...
     jc      tkepgm_backout              ; If the FuStrLen call failed we bail out!
 
@@ -195 +195 @@
     mov     di, [ebp + OffArg]          ; bx:di -> arguments
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:f_FuStrLenZ
+    call    f_FuStrLenZ                 ; NB/TODO/FIXME: this is a 16-bit call...
     jc      tkepgm_backout
 
@@ -269 +269 @@
     mov     cx, [ebp + cchFilename]     ; cx = length of area to copy
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:f_FuBuff
+    call    f_FuBuff                    ; NB/TODO/FIXME: this is a 16-bit call...
     jc      tkepgm_backout2             ; In case of error back (quite unlikely).
 
@@ -290 +290 @@
     mov     cx, [ebp + cchArgs]         ; cx = length of area to copy
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:f_FuBuff
+    call    f_FuBuff                    ; NB/TODO/FIXME: this is a 16-bit call...
     jc      tkepgm_backout2             ; In case of error back (quite unlikely).
 
@@ -316 +316 @@
 tkepgm_callbehind:
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:g_tkExecPgm
+    call    g_tkExecPgm
     pushfd                              ; preserve flags
     push    eax                         ; preserve result.
@@ -337 +337 @@
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
-    call    near ptr FLAT:_KSEMQueryMutex@8
+    call    _KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)
     pop     eax                         ; Pops usage count.
@@ -411 +411 @@
 myg_tkExecPgm_CalltkExecPgm:
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:g_tkExecPgm
+    call    g_tkExecPgm
     leave
     retf
@@ -485 +485 @@
     push    eax                         ; Source buffer pointer. (user)
     push    ebx                         ; Target buffer pointer.
-    call    near ptr FLAT:_TKFuBuff@16
+    call    _TKFuBuff@16
 
 tkepce_ret:
@@ -543 +543 @@
     xor     ecx, ecx
     push    cs                          ; Problem calling far into the calltab segement.
-    call    near ptr FLAT:f_FuStrLenZ
+    call    f_FuStrLenZ                 ; NB/TODO/FIXME: this is a 16-bit call...
     jc      tkepel_err_ret
     movzx   eax, cx

trunk/src/win32k/ldr/mytkStartProcess.asm

@@ -1 @@
-; $Id: mytkStartProcess.asm,v 1.3 2000-10-01 02:58:19 bird Exp $
+; $Id: mytkStartProcess.asm,v 1.4 2001-02-23 02:57:55 bird Exp $
 ;
 ; tkStartProcess overloader. Needed to clear the loader semaphore
@@ -26 +26 @@
     extrn pLdrSem:DWORD
     extrn _LDRClearSem@0:PROC
-    extrn _KSEMRequestMutex@8:PROC
     extrn _KSEMQueryMutex@8:PROC
 
@@ -53 +52 @@
     ;
     extrn _tkStartProcess:PROC
+
 
 ;
@@ -88 +88 @@
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
-    call    near ptr FLAT:_KSEMQueryMutex@8
+    call    _KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)
     pop     eax                         ; Pops usage count.
@@ -99 +99 @@
     cmp     eax, 2                      ; If usage count > 1 then issue a release. (should not happen here)
     jl      mtksp_ret                   ; jmp if usage count < 2. (tkStartProcess or tkExecPgm will free the last usage).
-    call    near ptr FLAT:_LDRClearSem@0
+    call    _LDRClearSem@0
 
 mtksp_ret:
@@ -105 +105 @@
     pop     ecx
     pop     eax
-    jmp     near ptr FLAT:_tkStartProcess
+    jmp     _tkStartProcess
 _mytkStartProcess ENDP