Changeset 4046 for branches/Grace/src

Timestamp:

Aug 19, 2000, 4:37:21 PM (25 years ago)

Author:

bird

Message:

More bugs corrected.
It's working now!

Location:

branches/Grace/src/win32k/ldr

Files:

• calltab.asm (modified) (8 diffs)
• myLDRQAppType.cpp (modified) (2 diffs)
• mytkExecPgm.asm (modified) (7 diffs)

branches/Grace/src/win32k/ldr/calltab.asm

@@ -1 @@
-; $Id: calltab.asm,v 1.12.4.2 2000-08-15 07:03:25 bird Exp $
+; $Id: calltab.asm,v 1.12.4.3 2000-08-19 14:37:13 bird Exp $
 ;
 ; callTab - Call back again table - table with entry for each function or
@@ -44 +44 @@
     public _LDRClearSem@0
     public _KSEMRequestMutex@8
+    public _KSEMReleaseMutex@4
 
     public pLDRSem
@@ -206 +207 @@
 
 ; 21
+_KSEMReleaseMutex@4 PROC NEAR
+    db MAXSIZE_PROLOG dup(0cch)
+_KSEMReleaseMutex@4 ENDP
+
+; 22
 pLDRSem          dd  0
 LDRSem_offObject dd  0
@@ -212 +218 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 22
+; 23
 _TKSuBuff@16 PROC NEAR
     db MAXSIZE_PROLOG dup(0cch)
 _TKSuBuff@16 ENDP
 
-; 23
+; 24
 _TKFuBuff@16 PROC NEAR
     db MAXSIZE_PROLOG dup(0cch)
 _TKFuBuff@16 ENDP
 
-; 24
+; 25
 _TKFuBufLen@20 PROC NEAR
     db MAXSIZE_PROLOG dup(0cch)
 _TKFuBufLen@20 ENDP
 
-;25
+; 26
 _ldrValidateMteHandle@4 PROC NEAR
     db MAXSIZE_PROLOG dup(0cch)
 _ldrValidateMteHandle@4 ENDP
 
-; 26
+; 27
 ppTCBCur           dd  0
 pTCBCur_offObject  dd  0
@@ -239 +245 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 27
+; 28
 ppPTDACur          dd  0
 pPTDACur_offObject dd  0
@@ -246 +252 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 28
+; 29
 pptda_start          dd  0
 ptda_start_offObject dd  0
@@ -253 +259 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 29
+; 30
 pptda_environ          dd  0
 ptda_environ_offObject dd  0
@@ -260 +266 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 30
+; 31
 pptda_module          dd  0
 ptda_module_offObject dd  0

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

@@ -1 @@
-/* $Id: myLDRQAppType.cpp,v 1.3.4.1 2000-07-16 22:43:35 bird Exp $
+/* $Id: myLDRQAppType.cpp,v 1.3.4.2 2000-08-19 14:37:14 bird Exp $
  *
  * _myLDRQAppType - _LDRQAppType overload.
@@ -47 +47 @@
     kprintf(("myLDRQAppType: entry\n"));
 
-    rc = LDRGetSem();
+    rc = LDRRequestSem();
     if (rc != NO_ERROR)
     {

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

@@ -1 @@
-; $Id: mytkExecPgm.asm,v 1.10.4.2 2000-08-17 08:23:34 bird Exp $
+; $Id: mytkExecPgm.asm,v 1.10.4.3 2000-08-19 14:37:16 bird Exp $
 ;
 ; mytkExecPgm - tkExecPgm overload
@@ -84 +84 @@
     public tkExecPgmCopyEnv
 
+    public fLdrSemTaken
     public fTkExecPgm
     public achTkExecPgmFilename
@@ -100 +101 @@
 ; (and you'll have to be behind the loader semaphore of course!)
 DATA16 SEGMENT
+fLdrSemTaken            db 0            ; 0 - Loader Semaphore not taken
+                                        ; 1 - Loader semaphore is taken and will be freed at exit.
 fTkExecPgm              db 0            ; 0 - achTkExecPgmFilename and achTkExecPgmArguments is INVALID
                                         ; 1 - achTkExecPgmFilename and achTkExecPgmArguments is VALID.
@@ -223 +226 @@
 
     push    0ffffffffh                  ; Wait indefinitely.
-    push    dword ptr eax               ; LDRSem handle.
+    push    eax                         ; LDRSem handle.
     call    near ptr FLAT:_KSEMRequestMutex@8
     or      eax, eax                    ; Check if failed.
     jnz     tkepgm_backout              ; Backout on failure.
+    mov     fLdrSemTaken, 1             ; Marks that the loader semaphore is taken
 
 
@@ -313 +317 @@
     push    cs                          ; Problem calling far into the calltab segement.
     call    near ptr FLAT:_g_tkExecPgm
-    pushfd
-
-    ;
-    ; Clear loader semaphore.
-    ;
+    pushfd                              ; preserve flags
     push    eax                         ; preserve result.
     push    ecx                         ; preserve ecx just in case
@@ -324 +324 @@
     mov     ds, ax
     mov     es, ax
-    ASSUME  ds:FLAT, es:FLAT
-    call    near ptr FLAT:_LDRClearSem@0
-    pop     edx                         ; restore edx
-    pop     ecx                         ; restore ecx
-    pop     eax                         ; restore result.
+    ASSUME  ds:FLAT, es:FLAT            ; both ds and es are now FLAT
 
     ;
@@ -338 +334 @@
 
     ;
+    ; Clear loader semaphore.
+    ;
+    cmp     fLdrSemTaken, 0             ; is the semaphore still taken?
+    je      tkepgm_callbehindret        ; jmp if not taken.
+    mov     fLdrSemTaken, 0             ; Loader semaphore is not taken any longer!
+    call    near ptr FLAT:_LDRClearSem@0
+
+    ;
     ; Restore ds and es (probably unecessary but...) and Return
     ;
+tkepgm_callbehindret:
     push    dword ptr [ebp + SegFilename]
     pop     ds
     push    dword ptr [ebp + SegEnv]
     pop     es
-    popfd
+    pop     edx                         ; restore edx
+    pop     ecx                         ; restore ecx
+    pop     eax                         ; restore result.
+    popfd                               ; restore flags
     leave
     retf