Changeset 646 for trunk/src/kernel32


Ignore:
Timestamp:
Aug 23, 1999, 3:55:08 PM (26 years ago)
Author:
sandervl
Message:

Logfile changes

Location:
trunk/src/kernel32
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/KERNEL32.DEF

    r634 r646  
    1 ; $Id: KERNEL32.DEF,v 1.27 1999-08-22 22:11:22 sandervl Exp $
     1; $Id: KERNEL32.DEF,v 1.28 1999-08-23 13:54:43 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    44;Basis is Windows95 KERNEL32
    55LIBRARY KERNEL32 INITINSTANCE TERMINSTANCE
    6 DATA MULTIPLE NONSHARED
     6DATA MULTIPLE NONSHARED LOADONCALL
     7CODE SHARED LOADONCALL
     8
     9SEGMENTS
     10
     11   _GLOBALDATA CLASS 'DATA'       SHARED LOADONCALL READWRITE
    712
    813IMPORTS

  • trunk/src/kernel32/initterm.cpp

    r615 r646  
    1 /* $Id: initterm.cpp,v 1.12 1999-08-22 08:33:14 sandervl Exp $ */
     1/* $Id: initterm.cpp,v 1.13 1999-08-23 13:54:42 sandervl Exp $ */
    22
    33/*
    … …  
    3636#include "handlemanager.h"
    3737#include "profile.h"
     38#include "initterm.h"
    3839
    3940/*-------------------------------------------------------------------*/
    … …  
    5152}
    5253
    53 void CloseLogFile(); //misc.cpp
     54//Global DLL Data
     55#pragma data_seg(_GLOBALDATA)
     56int globLoadNr = 0;
     57#pragma data_seg()
    5458
    5559/* Tue 03.03.1998: knut */
    5660/* flag to optimize DosAllocMem to use all the memory on SMP machines */
    57 ULONG flAllocMem;
    58 
    59 #ifndef PAG_ANY
    60     #define PAG_ANY    0x00000400
    61 #endif
    62 
    63 #ifndef QSV_VIRTUALADDRESSLIMIT
    64     #define QSV_VIRTUALADDRESSLIMIT 30
    65 #endif
     61ULONG flAllocMem = 0;
     62int   loadNr = 0;
    6663
    6764/****************************************************************************/
    … …  
    8986    {
    9087        case 0 :
     88            loadNr = globLoadNr++;
     89
    9190            dprintf(("kernel32 init\n"));
    9291            _ctordtorInit();

  • trunk/src/kernel32/makefile

    r623 r646  
    1 # $Id: makefile,v 1.25 1999-08-22 14:30:59 sandervl Exp $
     1# $Id: makefile,v 1.26 1999-08-23 13:54:43 sandervl Exp $
    22
    33#
    … …  
    110110    os2heap.h
    111111
    112 initterm.OBJ: .\initterm.cpp
     112initterm.OBJ: .\initterm.cpp initterm.h
    113113
    114114thunk.OBJ: \
    … …  
    166166misc.OBJ: \
    167167    .\misc.cpp \
     168    initterm.h \
    168169    $(PDWIN32_INCLUDE)\misc.h
    169170
    … …  
    298299
    299300pefile.OBJ:    pefile.cpp $(PDWIN32_INCLUDE)\pefile.h
    300 winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h
     301winimage.OBJ:  winimage.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winres.h initterm.h
    301302winimgres.OBJ: winimgres.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h $(PDWIN32_INCLUDE)\pefile.h $(PDWIN32_INCLUDE)\winexe.h $(PDWIN32_INCLUDE)\winres.h
    302303windll.OBJ:    windll.cpp $(PDWIN32_INCLUDE)\winimage.h $(PDWIN32_INCLUDE)\windll.h

  • trunk/src/kernel32/misc.cpp

    r615 r646  
    1 /* $Id: misc.cpp,v 1.8 1999-08-22 08:33:14 sandervl Exp $ */
     1/* $Id: misc.cpp,v 1.9 1999-08-23 13:54:43 sandervl Exp $ */
    22
    33/*
    … …  
    2727#include <win32type.h>
    2828#include "misc.h"
    29 
     29#include "os2util.h"
     30#include "initterm.h"
    3031
    3132/*****************************************************************************
    … …  
    253254    init = TRUE;
    254255
    255     if(!getenv("NOWIN32LOG"))
    256       flog = fopen("win32os2.log", "w");
     256    if(!getenv("NOWIN32LOG")) {
     257        char logname[CCHMAXPATH];
     258
     259        sprintf(logname, "odin32_%d.log", loadNr);
     260        flog = fopen(logname, "w");
     261    }
    257262    else
    258263      fLogging = FALSE;
    … …  
    278283{
    279284  fclose(flog);
     285  flog = 0;
    280286}
    281287

  • trunk/src/kernel32/winimage.cpp

    r622 r646  
    1 /* $Id: winimage.cpp,v 1.13 1999-08-22 14:24:35 sandervl Exp $ */
     1/* $Id: winimage.cpp,v 1.14 1999-08-23 13:54:43 sandervl Exp $ */
    22
    33/*
    … …  
    3535#include "winres.h"
    3636#include "os2util.h"
     37#include "initterm.h"
    3738
    3839char szErrorTitle[]     = "Win32 for OS/2";
    … …  
    7172  fNativePEImage = TRUE;
    7273
    73   if(foutInit == FALSE) {
    74     fout.open("pe.log", ios::out | ios::trunc);
    75     foutInit = TRUE;
    76   }
    7774  strcpy(this->szFileName, szFileName);
    7875
    … …  
    8784  if(dot)
    8885        *dot = 0;
     86
     87  if(foutInit == FALSE) {
     88    char logname[32];
     89        sprintf(logname, "pe_%d.log", loadNr);
     90        fout.open(logname, ios::out | ios::trunc);
     91        dprintf(("PE LOGFILE for %s: %s (rc=%d)", szModule, logname));
     92        foutInit = TRUE;
     93  }
    8994
    9095#ifdef DEBUG
Note: See TracChangeset for help on using the changeset viewer.