Changeset 4076 for branches

Timestamp:

Aug 24, 2000, 3:36:29 AM (25 years ago)

Author:

bird

Message:

Tested and corrected bugs.

Location:

branches

Files:

• GRACE/src/win32k/pe2lx/pe2lx.cpp (modified) (6 diffs)
• GRACE/src/win32k/test/fake.c (modified) (5 diffs)
• Grace/src/win32k/ldr/mytkExecPgm.asm (modified) (2 diffs)
• Grace/src/win32k/ldr/mytkStartProcess.asm (modified) (4 diffs)
• Grace/src/win32k/test/fakea.asm (modified) (2 diffs)

branches/GRACE/src/win32k/pe2lx/pe2lx.cpp

@@ -1 @@
-/* $Id: pe2lx.cpp,v 1.18.4.6 2000-08-22 03:00:22 bird Exp $
+/* $Id: pe2lx.cpp,v 1.18.4.7 2000-08-24 01:36:26 bird Exp $
  *
  * Pe2Lx class implementation. Ring 0 and Ring 3
@@ -1328 +1328 @@
     #ifdef RING0
     #if 1
+    initOdin32Path();
     return ldrOpenPath(pachModname, cchModname, pLdrLv, pfl);
     #else
@@ -4696 +4697 @@
 BOOL Pe2Lx::initOdin32Path()
 {
-    #if 0
+    #ifdef RING0
     APIRET rc;
     PMTE   pMTE;
@@ -4708 +4709 @@
      */
     pMTE = NULL;
-    rc = ldrFindModule("KERNEL32", 8, CLASS_GLOBAL, &pMTE);
+    rc = ldrFindModule("KERNEL32", 8, CLASS_GLOBAL, (PPMTE)SSToDS(&pMTE));
     if (rc == NO_ERROR && pMTE != NULL && pMTE->mte_swapmte != NULL)
     {
@@ -4744 +4745 @@
     ul = options.fNoLoader;
     options.fNoLoader = TRUE;
-    rc = ldrOpenPath("KERNEL32", 8, &lv, &ful);
+    lv.lv_class = CLASS_GLOBAL;
+    rc = ldrOpenPath("KERNEL32", 8, (ldrlv_t*)SSToDS(&lv), (PULONG)SSToDS(&ful));
     options.fNoLoader = ul;
     if (rc == NO_ERROR)
@@ -4754 +4756 @@
          * We'll close the file handle first of course.
          */
+        rc = setOdin32Path(ldrpFileNameBuf);
         ldrClose(lv.lv_sfn);
-        return setOdin32Path(ldrpFileNameBuf);
+        return rc;
     }
 

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

@@ -1 @@
-/* $Id: fake.c,v 1.1.4.3 2000-08-23 04:25:45 bird Exp $
+/* $Id: fake.c,v 1.1.4.4 2000-08-24 01:36:29 bird Exp $
  *
  * Fake stubs for the ldr and kernel functions we imports or overloads.
@@ -858 +858 @@
     else
     {
-        fRc = (hkmtx->debug.ksem_Owner != usSlot);
+        fRc = (hkmtx->debug.ksem_Owner == usSlot);
         if (pcusNest)
             *pcusNest = hkmtx->debug.ksem_cusNest;
@@ -1041 +1041 @@
 
     printf("tkExecPgmWorker:                execFlag = %d, pArg = %p, pEnv = %p, pszFilename = %s\n", execFlag, pArg, pEnv, pszFilename);
+
+    /*
+     * Take loader semaphore.
+     */
+    rc = KSEMRequestMutex(&fakeLDRSem, KSEM_INDEFINITE_WAIT);
+    if (rc != NO_ERROR)
+    {
+        return rc;
+    }
 
     /*
@@ -1744 +1753 @@
 PMTE KRNLCALL fakeldrASMpMTEFromHandle(HMTE  hMTE)
 {
-    hMTE = hMTE;
+    PMTE pMte = (PMTE)hMTE;
+
+    pMte += 10; //just do something!
+
     return NULL;
 }
@@ -1750 +1762 @@
 ULONG LDRCALL   fakeldrFindModule(PCHAR pachFilename, USHORT cchFilename, USHORT usClass, PPMTE ppMTE)
 {
+    APIRET rc = NO_ERROR;
     usClass = usClass;
     cchFilename = cchFilename;
     pachFilename = pachFilename;
     *ppMTE = NULL;
-    return NO_ERROR;
-}
-
-
+    return rc;
+}
+
+

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

@@ -1 @@
-; $Id: mytkExecPgm.asm,v 1.10.4.5 2000-08-22 03:00:21 bird Exp $
+; $Id: mytkExecPgm.asm,v 1.10.4.6 2000-08-24 01:36:25 bird Exp $
 ;
 ; mytkExecPgm - tkExecPgm overload
@@ -337 +337 @@
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
-    call    _KSEMQueryMutex@8
+    call    near ptr FLAT:_KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)
-    je      tkepgm_callbehindret        ; jmp if not taken by us (FALSE).
     pop     eax                         ; Pops usage count.
+    je      tkepgm_callbehindret        ; jmp if not taken by us (rc=FALSE).
     or      eax, eax                    ; Check usage count.
     jz      tkepgm_callbehindret        ; jmp if 0 (=free).

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

@@ -1 @@
-; $Id: mytkStartProcess.asm,v 1.1.2.3 2000-08-23 04:25:44 bird Exp $
+; $Id: mytkStartProcess.asm,v 1.1.2.4 2000-08-24 01:36:26 bird Exp $
 ;
 ; tkStartProcess overloader. Needed to clear the loader semaphore
@@ -72 +72 @@
 ; @remark
 mytkStartProcess PROC NEAR
-    ASSUME CS:CODE32, DS:FLAT, ES:NOTHING, SS:NOTHING
+    ASSUME DS:FLAT, ES:NOTHING, SS:NOTHING
 
     ;
@@ -88 +88 @@
     push    eax                         ; Push address of usage count pointer.
     push    pLdrSem                     ; Push pointer to loader semaphore ( = handle).
-    call    _KSEMQueryMutex@8
+    call    near ptr FLAT:_KSEMQueryMutex@8
     or      eax, eax                    ; Check return code. (1 = our / free; 0 = not our but take)
-    jz      mtksp_ret                   ; jmp if not taken by us (FALSE).
     pop     eax                         ; Pops usage count.
+    jz      mtksp_ret                   ; jmp if not taken by us (rc=FALSE).
     or      eax, eax                    ; Check usage count.
     jz      mtksp_ret                   ; jmp if 0 (=free).
@@ -105 +105 @@
     pop     ecx
     pop     eax
-    jmp     _tkStartProcess
+    jmp     near ptr FLAT:_tkStartProcess
 mytkStartProcess ENDP
 

branches/Grace/src/win32k/test/fakea.asm

@@ -1 @@
-; $Id: fakea.asm,v 1.1.4.3 2000-08-23 04:25:46 bird Exp $
+; $Id: fakea.asm,v 1.1.4.4 2000-08-24 01:36:29 bird Exp $
 ;
 ; Fake assembly imports.
@@ -305 +305 @@
     push    ebp
     mov     ebp, esp
-
-    ;
-    ; Take loader semaphore.
-    ;
-    push    0ffffffffh
-    push    offset fakeLDRSem
-    call    _fakeKSEMRequestMutex@8
-    or      eax, eax
-    jnz     ftkep_ret2
 
     ;