Changeset 510 for trunk/src/kernel32


Ignore:
Timestamp:
Aug 16, 1999, 6:28:05 PM (26 years ago)
Author:
sandervl
Message:

Makefile changes & initterm.cpp no longer calls c/c++ library init & termination functions (should only be done in odincrt.dll)

Location:
trunk/src/kernel32
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/initterm.cpp

    r142 r510  
    1 /* $Id: initterm.cpp,v 1.7 1999-06-21 08:21:55 phaller Exp $ */
     1/* $Id: initterm.cpp,v 1.8 1999-08-16 16:28:02 sandervl Exp $ */
    22
    33/*
    … …  
    3535#include <wprocess.h>
    3636#include "handlemanager.h"
    37 
    38 extern "C" {
    39 /*-------------------------------------------------------------------*/
    40 /* _CRT_init is the C run-time environment initialization function.  */
    41 /* It will return 0 to indicate success and -1 to indicate failure.  */
    42 /*-------------------------------------------------------------------*/
    43 int CDECL CRT_init(void);
    44 /*-------------------------------------------------------------------*/
    45 /* _CRT_term is the C run-time environment termination function.     */
    46 /* It only needs to be called when the C run-time functions are      */
    47 /* statically linked.                                                */
    48 /*-------------------------------------------------------------------*/
    49 void CDECL CRT_term(void);
    50 void CDECL _ctordtorInit( void );
    51 void CDECL _ctordtorTerm( void );
    52 }
    5337
    5438/*-------------------------------------------------------------------*/
    … …  
    9781    {
    9882        case 0 :
    99 
    100             /*******************************************************************/
    101             /* The C run-time environment initialization function must be      */
    102             /* called before any calls to C run-time functions that are not    */
    103             /* inlined.                                                        */
    104             /*******************************************************************/
    105 
    106             if (CRT_init() == -1)
    107                 return 0UL;
    108             _ctordtorInit();
    109 
    11083            dprintf(("kernel32 init\n"));
    11184            CheckVersionFromHMOD(PE2LX_VERSION, hModule); /*PLF Wed  98-03-18 05:28:48*/
    … …  
    11588            /*******************************************************************/
    11689
    117             rc = DosExitList(0x0000FF00|EXLST_ADD, cleanup);
     90            rc = DosExitList(0x0000F000|EXLST_ADD, cleanup);
    11891            if (rc)
    11992                return 0UL;
    … …  
    147120{
    148121    dprintf(("kernel32 exit %d\n", ulReason));
    149     _dump_allocated(10);    /*PLF Wed  98-03-18 23:55:07*/
    150122    DestroyTIB();
    151     _ctordtorTerm();
    152     CRT_term();
    153123    DosExitList(EXLST_EXIT, cleanup);
    154124    return ;

  • trunk/src/kernel32/makefile

    r486 r510  
    1 # $Id: makefile,v 1.17 1999-08-12 14:20:29 sandervl Exp $
     1# $Id: makefile,v 1.18 1999-08-16 16:28:02 sandervl Exp $
    22
    33#
    … …  
    8585
    8686$(TARGET).dll: $(OBJS) $(TARGET).def
    87         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\PMWINX.LIB $(PDWIN32_LIB)\LIBULS.LIB $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB
     87        $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(PDWIN32_LIB)\PMWINX.LIB $(PDWIN32_LIB)\LIBULS.LIB $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB cppom30O.lib
    8888        rc -r console.rc console.res
    8989        rc console.res $@
Note: See TracChangeset for help on using the changeset viewer.