Changeset 4108 for branches/Grace/src

Timestamp:

Aug 29, 2000, 12:44:25 AM (25 years ago)

Author:

bird

Message:

New import (ptda_ptdasem).
Found and corrected problem with deadlock in myLDRQAppType. (Had to
take the intra-process semaphore (ptda_ptdasem) first.)

Location:

branches/Grace/src/win32k

Files:

• include/OS2Krnl.h (modified) (2 diffs)
• ldr/calltab.asm (modified) (5 diffs)
• ldr/myLDRQAppType.cpp (modified) (4 diffs)
• test/fakea.asm (modified) (3 diffs)

branches/Grace/src/win32k/include/OS2Krnl.h

@@ -1 @@
-/* $Id: OS2Krnl.h,v 1.7.4.1 2000-07-16 22:43:27 bird Exp $
+/* $Id: OS2Krnl.h,v 1.7.4.2 2000-08-28 22:44:22 bird Exp $
  *
  * OS/2 kernel structures, typedefs and macros.
@@ -243 +243 @@
 #endif
 
+#if defined(INCL_OS2KRNL_PTDA) && !defined(INCL_OS2KRNL_SEM)
+    #define INCL_OS2KRNL_SEM
+#endif
+
 #ifdef INCL_OS2KRNL_IO
     #include <OS2KIO.h>

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

@@ -1 @@
-; $Id: calltab.asm,v 1.12.4.7 2000-08-23 04:16:43 bird Exp $
+; $Id: calltab.asm,v 1.12.4.8 2000-08-28 22:44:23 bird Exp $
 ;
 ; callTab - Call back again table - table with entry for each function or
@@ -86 +86 @@
     public ptda_environ_sel
 
+    public pptda_ptdasem
+    public ptda_ptdasem_offObject
+    public _fpptda_ptdasem
+    public ptda_ptdasem_sel
+
     public pptda_module
     public ptda_module_offObject
@@ -320 +325 @@
 
 ; 37
+pptda_ptdasem          dd  0
+ptda_ptdasem_offObject dd  0
+_fpptda_ptdasem        dd  0
+ptda_ptdasem_sel       dw  0
+    db (MAXSIZE_PROLOG - 14) dup(0cch)
+
+; 38
 pptda_module          dd  0
 ptda_module_offObject dd  0
@@ -326 +338 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-; 38
+; 39
 pptda_pBeginLIBPATH           dd  0
 ptda_pBeginLIBPATH_offObject  dd  0
@@ -333 +345 @@
     db (MAXSIZE_PROLOG - 14) dup(0cch)
 
-
-; 39
+; 40
 pldrpFileNameBuf              dd  0
 pldrpFileNameBuf_offObject    dd  0

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

@@ -1 @@
-/* $Id: myLDRQAppType.cpp,v 1.3.4.2 2000-08-19 14:37:14 bird Exp $
+/* $Id: myLDRQAppType.cpp,v 1.3.4.3 2000-08-28 22:44:24 bird Exp $
  *
  * _myLDRQAppType - _LDRQAppType overload.
@@ -15 +15 @@
 #define INCL_NOPMAPI
 
+#define INCL_OS2KRNL_PTDA
 #define INCL_OS2KRNL_SEM
 
@@ -46 +47 @@
 
     kprintf(("myLDRQAppType: entry\n"));
-
+    rc = KSEMRequestMutex(ptda_ptda_ptdasem(ptdaGetCur()), KSEM_INDEFINITE_WAIT);
+    if (rc != NO_ERROR)
+    {
+        kprintf(("myLDRQAppType: failed to get intra-process semaphore.\n"));
+        return rc;
+    }
     rc = LDRRequestSem();
     if (rc != NO_ERROR)
@@ -63 +69 @@
 
     LDRClearSem();
+    KSEMReleaseMutex(ptda_ptda_ptdasem(ptdaGetCur()));
     kprintf(("myLDRQAppType: exit\n"));
 

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

@@ -1 @@
-; $Id: fakea.asm,v 1.1.4.5 2000-08-25 04:47:28 bird Exp $
+; $Id: fakea.asm,v 1.1.4.6 2000-08-28 22:44:25 bird Exp $
 ;
 ; Fake assembly imports.
@@ -31 +31 @@
     public fakeptda_environ
     public fakeptda_module
+    public fakeptda_ptdasem
+    public fakeptda_pBeginLIBPATH
     public fakef_FuStrLenZ
     public fakef_FuStrLen
@@ -60 +62 @@
 fakeptda_dummy              db  123 dup (0)
 fakeptda_environ            dw      1   ; 1 is the hardcoded HOB of the win32ktst.exe's environment.
+fakeptda_ptda_sem           db  20  dup (0) ; PTDA semaphore - Intra-Process serialisation mutex KSEM (sg244640).
 fakeptda_module             dw      1   ; 1 is the hardcoded HMTE of the current executable module.
 fakeptda_pBeginLIBPATH      dd      0   ; BEGINLIBPATH not implemented.