Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/winexepeldr.cpp

    r10397 r21916  
    1919#include <string.h>
    2020#include <stdlib.h>
     21#ifndef __GNUC__
    2122#include <iostream.h>
    2223#include <fstream.h>
     24#endif
    2325#include <misc.h>
    2426#include <win32type.h>
    2527#include <win32api.h>
    26 #include <winexepeldr.h>
     28#include "winexepeldr.h"
    2729#include <wprocess.h>
    2830#include <pefile.h>
    … …  
    5355//Called by ring 3 pe loader to create win32 executable
    5456//PE.EXE command line options:
    55 //   /OPT:[x1=y,x2=z,..]         
     57//   /OPT:[x1=y,x2=z,..]
    5658//   x = CURDIR    -> set current directory to y
    5759//   (not other options available at this time)
    5860//******************************************************************************
     61extern "C"
    5962DWORD WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine,
    60                                    char *peoptions, 
     63                                   char *peoptions,
    6164                                   ULONG reservedMem, ULONG ulPEOffset,
    6265                                   BOOL fConsoleApp, BOOL fVioConsole,
    … …  
    118121  free(szFullCmdLine);
    119122
    120   //Init console before loading executable as dlls might want to print 
     123  //Init console before loading executable as dlls might want to print
    121124  //something on the console while being loaded
    122   if(WinExe->isConsoleApp()) 
     125  if(WinExe->isConsoleApp())
    123126  {
    124127      dprintf(("Console application!\n"));
    … …  
    142145  }
    143146  OS2UnsetExceptionHandler(&exceptFrame);
    144  
     147
    145148#ifdef PROFILE
    146149  // Note: after this point, we might start collecting performance
    … …  
    150153  ProfilerEnable(TRUE);
    151154#endif /* PROFILE */
    152  
    153  
     155
     156
    154157  WinExe->start();
    155158
Note: See TracChangeset for help on using the changeset viewer.