Changeset 2648 for trunk/src

Timestamp:

Feb 5, 2000, 3:03:46 AM (26 years ago)

Author:

sandervl

Message:

rewrote dll entrypoint + export fixes (initterm)

Location:

trunk/src/msvcrt

Files:

• initterm.cpp (deleted)
• makefile (modified) (6 diffs)
• msvcrt.def (modified) (2 diffs)
• msvcrt20.def (modified) (2 diffs)
• msvcrt40.def (modified) (2 diffs)

trunk/src/msvcrt/makefile

@@ -1 @@
-# $Id: makefile,v 1.9 1999-12-29 18:49:01 sandervl Exp $
+# $Id: makefile,v 1.10 2000-02-05 02:03:45 sandervl Exp $
 
 #
@@ -26 +26 @@
 TARGET40 = msvcrt40
 
-OBJS   =  msvcrt.obj initterm.obj resource.obj
-OBJS20 =  msvcrt.obj initterm.obj resource20.obj
-OBJS40 =  msvcrt.obj initterm.obj resource40.obj
+OBJS   =  msvcrt.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
+OBJS20 =  msvcrt.obj resource20.obj $(PDWIN32_LIB)/dllentry.obj
+OBJS40 =  msvcrt.obj resource40.obj $(PDWIN32_LIB)/dllentry.obj
 
 all: $(TARGET).dll $(TARGET).lib $(TARGET20).dll $(TARGET20).lib \
@@ -36 +36 @@
 $(TARGET).dll: $(OBJS) $(TARGET).def
         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/crtdll.lib \
+              $(PDWIN32_LIB)/kernel32.lib \
+              $(PDWIN32_LIB)/crtdll.lib  \
               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
         $(CP) $@ $(PDWIN32_BIN)
@@ -43 +43 @@
 $(TARGET20).dll: $(OBJS20) $(TARGET20).def
         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS20) $(TARGET20).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
+              $(PDWIN32_LIB)/kernel32.lib \
               $(PDWIN32_LIB)/crtdll.lib \
               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
@@ -50 +50 @@
 $(TARGET40).dll: $(OBJS40) $(TARGET40).def
         $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS40) $(TARGET40).def \
-              $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-              $(PDWIN32_LIB)/crtdll.lib \
+              $(PDWIN32_LIB)/kernel32.lib \
+              $(PDWIN32_LIB)/crtdll.lib  \
               $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
         $(CP) $@ $(PDWIN32_BIN)
@@ -83 +83 @@
 resource40.obj: resource40.asm
 
-initterm.obj: initterm.cpp
 msvcrt.obj: msvcrt.cpp
 

trunk/src/msvcrt/msvcrt.def

@@ -1 @@
-; $Id: msvcrt.def,v 1.14 2000-01-03 10:26:49 sandervl Exp $
+; $Id: msvcrt.def,v 1.15 2000-02-05 02:03:45 sandervl Exp $
 
 ;
@@ -281 +281 @@
     _i64toa                     = _MSVCRT__i64toa               @270
     _i64tow                     = _MSVCRT__i64tow               @271
-    _initterm                   = _DLL_InitTerm                 @272
+    _initterm                   = __initterm@12                 @272
     _inp                        = _MSVCRT__inp                  @273
     _inpd                       = _MSVCRT__inpd                 @274

trunk/src/msvcrt/msvcrt20.def

@@ -1 @@
-; $Id: msvcrt20.def,v 1.5 2000-01-03 10:26:49 sandervl Exp $
+; $Id: msvcrt20.def,v 1.6 2000-02-05 02:03:45 sandervl Exp $
 
 ;
@@ -210 +210 @@
     _heapwalk                   = _CRTDLL__heapwalk             @622
     _hypot                      = _CRTDLL__hypot                @623
-    _initterm                   = _DLL_InitTerm                 @624
+    _initterm                   = __initterm@12                 @624
     _iob                        = CRTDLL_iob                    @625
     _isatty                     = _CRTDLL__isatty               @626

trunk/src/msvcrt/msvcrt40.def

@@ -1 @@
-; $Id: msvcrt40.def,v 1.5 2000-01-03 10:26:49 sandervl Exp $
+; $Id: msvcrt40.def,v 1.6 2000-02-05 02:03:46 sandervl Exp $
 
 ;
@@ -268 +268 @@
     _heapwalk                   = _CRTDLL__heapwalk             @681
     _hypot                      = _CRTDLL__hypot                @682
-    _initterm                   = _DLL_InitTerm                 @683
+    _initterm                   = __initterm@12                 @683
     _inp                        = _MSVCRT__inp                  @684
     _inpd                       = _MSVCRT__inpd                 @685