Changeset 4440 for trunk/src

Timestamp:

Oct 6, 2000, 1:04:02 PM (25 years ago)

Author:

sandervl

Message:

console, pe loader + FormatMessage fixes

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• message.cpp (modified) (3 diffs)
• pefile.cpp (modified) (3 diffs)
• winexebase.cpp (modified) (2 diffs)
• winexepeldr.cpp (modified) (8 diffs)
• winexepeldr.h (modified) (3 diffs)
• winimagebase.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (11 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.87 2000-10-02 13:05:36 phaller Exp $
+; $Id: KERNEL32.DEF,v 1.88 2000-10-06 11:04:00 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -1033 +1033 @@
     _RegisterPe2LxDll@12                                          @1209
 
-    _CreateWin32PeLdrExe@12                                       @1236
+    _CreateWin32PeLdrExe@16                                       @1236
 
     _RegisterLxExe@8                                              @1237

trunk/src/kernel32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.11 2000-07-06 21:18:43 sandervl Exp $ */
+/* $Id: message.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
 
 /*
@@ -174 +174 @@
      INT   bufsize;
 
+//SvL/MN: VACPPWIN uses message ids > 64k!!
+#ifndef __WIN32OS2__
      dwMessageId &= 0xFFFF;
+#endif
      bufsize=LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,NULL,100);
      if (bufsize)
@@ -405 +408 @@
       INT   bufsize;
 
+//SvL/MN: VACPPWIN uses message ids > 64k!!
+#ifndef __WIN32OS2__
       dwMessageId &= 0xFFFF;
+#endif
       bufsize=LoadMessageA((HMODULE)lpSource,dwMessageId,dwLanguageId,NULL,100);
       if (bufsize)

trunk/src/kernel32/pefile.cpp

@@ -1 @@
-/* $Id: pefile.cpp,v 1.9 2000-06-26 13:21:34 sandervl Exp $ */
+/* $Id: pefile.cpp,v 1.10 2000-10-06 11:04:01 sandervl Exp $ */
 
 /*
@@ -104 +104 @@
 //******************************************************************************
 //******************************************************************************
-BOOL IsImportSection(LPVOID lpFile, PIMAGE_SECTION_HEADER psh) 
+BOOL IsSectionType(LPVOID lpFile, PIMAGE_SECTION_HEADER psh, DWORD dwIMAGE_DIRECTORY)
 {
   PIMAGE_OPTIONAL_HEADER poh = (PIMAGE_OPTIONAL_HEADER)OPTHEADEROFF (lpFile);
@@ -110 +110 @@
   DWORD                  ImageDirVA;
 
-    ImageDirVA = poh->DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress;
+    ImageDirVA = poh->DataDirectory[dwIMAGE_DIRECTORY].VirtualAddress;
 
     if(psh->VirtualAddress <= ImageDirVA &&
-       psh->VirtualAddress + max(psh->Misc.VirtualSize,psh->SizeOfRawData) > ImageDirVA &&
-       strcmp(psh->Name, ".idata") == 0)
+       psh->VirtualAddress + max(psh->Misc.VirtualSize,psh->SizeOfRawData) > ImageDirVA)
     {
         return TRUE;

trunk/src/kernel32/winexebase.cpp

@@ -1 @@
-/* $Id: winexebase.cpp,v 1.11 2000-09-12 19:01:59 sandervl Exp $ */
+/* $Id: winexebase.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
 
 /*
@@ -115 +115 @@
   //Set default FPU control word (no exceptions); same as in NT
   _control87(0x27F, 0xFFF);
+#if 0
   ULONG Size = 16, Attr;
   rc = DosQueryMem((PVOID) (entryPoint), &Size, &Attr);
   dprintf(("Start exe; Attr = %x, rc = %d", Attr, rc));
+#else
+  dprintf(("Start exe"));
+#endif
   rc = ((WIN32EXEENTRY)entryPoint)(NULL);
   RestoreOS2TIB();

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.11 2000-10-01 12:05:57 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
 
 /*
@@ -47 +47 @@
 //Called by ring 3 pe loader to create win32 executable
 //******************************************************************************
-BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine, ULONG reservedMem)
+BOOL WIN32API CreateWin32PeLdrExe(char *szFileName, char *szCmdLine, 
+                                  ULONG reservedMem, BOOL fConsoleApp)
 {
  APIRET  rc;
@@ -58 +59 @@
   fPeLoader = TRUE;
 
-  WinExe = new Win32PeLdrExe(szFileName);
+  WinExe = new Win32PeLdrExe(szFileName, fConsoleApp);
 
   rc = DosGetInfoBlocks(&ptib, &ppib);
@@ -81 +82 @@
 
   if(getenv("WIN32_IOPL2")) {
-    io_init1();
+        io_init1();
   }
-
-  OS2SetExceptionHandler(&exceptFrame);
-  if(WinExe->init(reservedMem) == FALSE) {
-        if(szErrorModule[0] != 0) {
-          char szErrorMsg[128];
-
-                sprintf(szErrorMsg, "Can't execute %s due to bad or missing %s", OSLibStripPath(szFileName), szErrorModule);
-                WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
-        }
-        delete WinExe;
-        return FALSE;
-  }
-
-  OS2UnsetExceptionHandler(&exceptFrame);
-  if(WinExe->isConsoleApp()) {
+  //Init console before loading executable as dlls might want to print 
+  //something on the console while being loaded
+  if(WinExe->isConsoleApp()) 
+  {
         dprintf(("Console application!\n"));
 
@@ -104 +94 @@
                 dprintf(("KERNEL32:Win32Image:Init ConsoleInit failed with %u.\n", rc));
   }
+
+  OS2SetExceptionHandler(&exceptFrame);
+  if(WinExe->init(reservedMem) == FALSE) 
+  {
+        if(szErrorModule[0] != 0) {
+                char szErrorMsg[128];
+
+                sprintf(szErrorMsg, "Can't execute %s due to bad or missing %s", OSLibStripPath(szFileName), szErrorModule);
+                WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, szErrorMsg, szErrorTitle, 0, MB_OK | MB_ERROR | MB_MOVEABLE);
+        }
+        delete WinExe;
+        OS2UnsetExceptionHandler(&exceptFrame);
+        return FALSE;
+  }
+  OS2UnsetExceptionHandler(&exceptFrame);
 
   WinExe->start();
@@ -113 +118 @@
 //******************************************************************************
 //******************************************************************************
-Win32PeLdrExe::Win32PeLdrExe(char *szFileName) :
+Win32PeLdrExe::Win32PeLdrExe(char *szFileName, BOOL fConsoleApp) :
                    Win32ImageBase(-1),
                    Win32ExeBase(-1),
@@ -119 +124 @@
 {
   dprintf(("Win32PeLdrExe ctor: %s", szFileName));
+  this->fConsoleApp = fConsoleApp;
+
+  //SvL: set temporary full path here as console init needs it
+  setFullPath(szFileName);
 }
 //******************************************************************************
@@ -132 +141 @@
 
   rc = Win32PeLdrImage::init(reservedMem);
-  fConsoleApp = (oh.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI);
   return rc;
 }

trunk/src/kernel32/winexepeldr.h

@@ -1 @@
-/* $Id: winexepeldr.h,v 1.2 2000-04-14 22:35:28 sandervl Exp $ */
+/* $Id: winexepeldr.h,v 1.3 2000-10-06 11:04:02 sandervl Exp $ */
 
 /*
@@ -16 +16 @@
 #include <winimagepeldr.h>
 
-typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG);
+typedef BOOL (* WIN32API WIN32CTOR)(char *, char *, ULONG, BOOL);
 
 //Class for executables run by the ring 3 PE loader
@@ -22 +22 @@
 {
 public:
-        Win32PeLdrExe(char *szFileName);
+        Win32PeLdrExe(char *szFileName, BOOL fConsoleApp);
 virtual ~Win32PeLdrExe();
 

trunk/src/kernel32/winimagebase.cpp

@@ -1 @@
-/* $Id: winimagebase.cpp,v 1.27 2000-09-18 19:26:16 sandervl Exp $ */
+/* $Id: winimagebase.cpp,v 1.28 2000-10-06 11:04:02 sandervl Exp $ */
 
 /*
@@ -85 +85 @@
 void Win32ImageBase::setFullPath(char *name)
 {
-  dassert(name, ("setFullPath, name == NULL"));
+  if(fullpath)
+        free(fullpath);
   fullpath = (char *)malloc(strlen(name)+1);
-  dassert(fullpath, ("setFullPath, fullpath == NULL"));
   strcpy(fullpath, name);
 }

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.55 2000-10-04 19:36:25 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.56 2000-10-06 11:04:02 sandervl Exp $ */
 
 /*
@@ -287 +287 @@
    if ((psh = (PIMAGE_SECTION_HEADER)SECTIONHDROFF (win32file)) != NULL) {
     dprintf((LOG, "*************************PE SECTIONS START**************************" ));
-    for (i=0; i<nSections; i++) { 
+    for (i=0; i<nSections; i++) 
+    { 
         dprintf((LOG, "Raw data size:        %x", psh[i].SizeOfRawData ));
         dprintf((LOG, "Virtual Address:      %x", psh[i].VirtualAddress ));
@@ -295 +296 @@
         dprintf((LOG, "Pointer to raw data:  %x", psh[i].PointerToRawData ));
         dprintf((LOG, "Section flags:        %x\n\n", psh[i].Characteristics ));
-        if(strcmp(psh[i].Name, ".reloc") == 0) {
+
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_BASERELOC)) 
+        {
             dprintf((LOG, ".reloc" ));
             addSection(SECTION_RELOC, psh[i].PointerToRawData,
@@ -302 +305 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".edata") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_EXPORT)) 
+        {
             dprintf((LOG, ".edata" ));
             addSection(SECTION_EXPORT, psh[i].PointerToRawData,
@@ -309 +313 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".rsrc") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_RESOURCE)) 
+        {
             dprintf((LOG, ".rsrc" ));
             addSection(SECTION_RESOURCE, psh[i].PointerToRawData,
@@ -316 +321 @@
             continue;
         }
-        if(strcmp(psh[i].Name, ".tls") == 0)
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_TLS))
         {
                 tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_TLS);
@@ -326 +331 @@
                 continue;
         }
-
-        if(strcmp(psh[i].Name, ".debug") == 0) {
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_DEBUG))  
+        {
             dprintf((LOG, ".rdebug" ));
             addSection(SECTION_DEBUG,  psh[i].PointerToRawData,
@@ -334 +339 @@
             continue;
         }
-        if(IsImportSection(win32file, &psh[i]))
+        if(IsSectionType(win32file, &psh[i], IMAGE_DIRECTORY_ENTRY_IMPORT)) 
         {
-          int type = SECTION_IMPORT;
+            int type = SECTION_IMPORT;
+
             dprintf((LOG, "Import Data Section" ));
             if(psh[i].Characteristics & IMAGE_SCN_CNT_CODE) {
@@ -348 +354 @@
         }
 
-            //KSO Sun 1998-08-09: Borland does not alway set the CODE flag for its "CODE" section
-        if(  psh[i].Characteristics & IMAGE_SCN_CNT_CODE ||
-            (psh[i].Characteristics & IMAGE_SCN_MEM_EXECUTE &&
-               !(psh[i].Characteristics & (IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_CNT_INITIALIZED_DATA))) //KSO: make sure its not marked as a datasection
+        //KSO Sun 1998-08-09: Borland does not alway set the CODE flag for its "CODE" section
+        if(psh[i].Characteristics & IMAGE_SCN_CNT_CODE ||
+           (psh[i].Characteristics & IMAGE_SCN_MEM_EXECUTE &&
+           !(psh[i].Characteristics & (IMAGE_SCN_CNT_UNINITIALIZED_DATA | IMAGE_SCN_CNT_INITIALIZED_DATA))) //KSO: make sure its not marked as a datasection
             )
         {
@@ -394 +400 @@
   }
   else {
-        if(GetSectionHdrByName (win32file, &sh, ".rsrc"))
+        if(GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE, &sh))
         {
             addSection(SECTION_RESOURCE, sh.PointerToRawData,
@@ -539 +545 @@
   //PH: get pResRootDir pointer correct first, since processImports may
   //    implicitly call functions depending on it.
-  if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
+  if(GetSectionHdrByImageDir(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE, &sh)) {
         //get offset in resource object of directory entry
         pResRootDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);