Changeset 4108 for branches/Grace/src


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/Grace/src/win32k/include/OS2Krnl.h

    r3834 r4108  
    1 /* $Id: OS2Krnl.h,v 1.7.4.1 2000-07-16 22:43:27 bird Exp $
     1/* $Id: OS2Krnl.h,v 1.7.4.2 2000-08-28 22:44:22 bird Exp $
    22 *
    33 * OS/2 kernel structures, typedefs and macros.
     
    243243#endif
    244244
     245#if defined(INCL_OS2KRNL_PTDA) && !defined(INCL_OS2KRNL_SEM)
     246    #define INCL_OS2KRNL_SEM
     247#endif
     248
    245249#ifdef INCL_OS2KRNL_IO
    246250    #include <OS2KIO.h>
  • branches/Grace/src/win32k/ldr/calltab.asm

    r4071 r4108  
    1 ; $Id: calltab.asm,v 1.12.4.7 2000-08-23 04:16:43 bird Exp $
     1; $Id: calltab.asm,v 1.12.4.8 2000-08-28 22:44:23 bird Exp $
    22;
    33; callTab - Call back again table - table with entry for each function or
     
    8686    public ptda_environ_sel
    8787
     88    public pptda_ptdasem
     89    public ptda_ptdasem_offObject
     90    public _fpptda_ptdasem
     91    public ptda_ptdasem_sel
     92
    8893    public pptda_module
    8994    public ptda_module_offObject
     
    320325
    321326; 37
     327pptda_ptdasem          dd  0
     328ptda_ptdasem_offObject dd  0
     329_fpptda_ptdasem        dd  0
     330ptda_ptdasem_sel       dw  0
     331    db (MAXSIZE_PROLOG - 14) dup(0cch)
     332
     333; 38
    322334pptda_module          dd  0
    323335ptda_module_offObject dd  0
     
    326338    db (MAXSIZE_PROLOG - 14) dup(0cch)
    327339
    328 ; 38
     340; 39
    329341pptda_pBeginLIBPATH           dd  0
    330342ptda_pBeginLIBPATH_offObject  dd  0
     
    333345    db (MAXSIZE_PROLOG - 14) dup(0cch)
    334346
    335 
    336 ; 39
     347; 40
    337348pldrpFileNameBuf              dd  0
    338349pldrpFileNameBuf_offObject    dd  0
  • branches/Grace/src/win32k/ldr/myLDRQAppType.cpp

    r4046 r4108  
    1 /* $Id: myLDRQAppType.cpp,v 1.3.4.2 2000-08-19 14:37:14 bird Exp $
     1/* $Id: myLDRQAppType.cpp,v 1.3.4.3 2000-08-28 22:44:24 bird Exp $
    22 *
    33 * _myLDRQAppType - _LDRQAppType overload.
     
    1515#define INCL_NOPMAPI
    1616
     17#define INCL_OS2KRNL_PTDA
    1718#define INCL_OS2KRNL_SEM
    1819
     
    4647
    4748    kprintf(("myLDRQAppType: entry\n"));
    48 
     49    rc = KSEMRequestMutex(ptda_ptda_ptdasem(ptdaGetCur()), KSEM_INDEFINITE_WAIT);
     50    if (rc != NO_ERROR)
     51    {
     52        kprintf(("myLDRQAppType: failed to get intra-process semaphore.\n"));
     53        return rc;
     54    }
    4955    rc = LDRRequestSem();
    5056    if (rc != NO_ERROR)
     
    6369
    6470    LDRClearSem();
     71    KSEMReleaseMutex(ptda_ptda_ptdasem(ptdaGetCur()));
    6572    kprintf(("myLDRQAppType: exit\n"));
    6673
  • branches/Grace/src/win32k/test/fakea.asm

    r4090 r4108  
    1 ; $Id: fakea.asm,v 1.1.4.5 2000-08-25 04:47:28 bird Exp $
     1; $Id: fakea.asm,v 1.1.4.6 2000-08-28 22:44:25 bird Exp $
    22;
    33; Fake assembly imports.
     
    3131    public fakeptda_environ
    3232    public fakeptda_module
     33    public fakeptda_ptdasem
     34    public fakeptda_pBeginLIBPATH
    3335    public fakef_FuStrLenZ
    3436    public fakef_FuStrLen
     
    6062fakeptda_dummy              db  123 dup (0)
    6163fakeptda_environ            dw      1   ; 1 is the hardcoded HOB of the win32ktst.exe's environment.
     64fakeptda_ptda_sem           db  20  dup (0) ; PTDA semaphore - Intra-Process serialisation mutex KSEM (sg244640).
    6265fakeptda_module             dw      1   ; 1 is the hardcoded HMTE of the current executable module.
    6366fakeptda_pBeginLIBPATH      dd      0   ; BEGINLIBPATH not implemented.
Note: See TracChangeset for help on using the changeset viewer.