Changeset 1708 for trunk/src/kernel32

Timestamp:

Nov 11, 1999, 8:10:09 PM (26 years ago)

Author:

sandervl

Message:

version loading fixes + heap corruption fix

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (2 diffs)
• directory.cpp (modified) (4 diffs)
• disk.cpp (modified) (3 diffs)
• lang.cpp (modified) (1 diff)
• makefile (modified) (2 diffs)
• misc.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (7 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.29 1999-11-09 19:22:31 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.30 1999-11-11 19:10:08 sandervl Exp $ */
 
 /*
@@ -367 +367 @@
     dprintf(("KERNEL32:  OS2GetEnvironmentVariableW\n"));
     asciibuffer = (char *)malloc(nSize+1);
+    *asciibuffer = 0;
     astring     = UnicodeToAsciiString((LPWSTR)lpName);
 

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.10 1999-11-08 21:24:24 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.11 1999-11-11 19:10:08 sandervl Exp $ */
 
 /*
@@ -105 +105 @@
 
 
-ODINFUNCTION1(BOOL,SetCurrentDirectoryA,LPCSTR,lpPathName)
+ODINFUNCTIONNODBG1(BOOL,SetCurrentDirectoryA,LPCSTR,lpPathName)
 {
   int len = strlen(lpPathName);
@@ -113 +113 @@
   if(tmp[len -1] == '\\')
     tmp[len -1] = 0;
+
+  dprintf(("SetCurrentDirectoryA %s", tmp));
   return O32_SetCurrentDirectory((LPSTR)tmp);
 }
@@ -325 +327 @@
 
   rc = GetWindowsDirectoryA(asciibuffer, uSize);
-  AsciiToUnicode(asciibuffer, lpBuffer);
+  if(rc)
+    AsciiToUnicode(asciibuffer, lpBuffer);
   free(asciibuffer);
   return(rc);

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.6 1999-11-09 01:22:32 phaller Exp $ */
+/* $Id: disk.cpp,v 1.7 1999-11-11 19:10:09 sandervl Exp $ */
 
 /*
@@ -82 +82 @@
  char *astring;
 
-    dprintf(("KERNEL32:  OS2GetDriveTypeW\n"));
     astring = UnicodeToAsciiString((LPWSTR)arg1);
+    dprintf(("KERNEL32:  OS2GetDriveTypeW %s", astring));
     rc = O32_GetDriveType(astring);
     FreeAsciiString(astring);
@@ -100 +100 @@
               DWORD,   nFileSystemNameSize)
 {
+   dprintf(("GetVolumeInformationA %s", lpRootPathName));
    return O32_GetVolumeInformation(lpRootPathName,
                                    lpVolumeNameBuffer,

trunk/src/kernel32/lang.cpp

@@ -27 +27 @@
 BOOL WIN32API IsValidCodePage(UINT CodePage)
 {
-  dprintf(("KERNEL32:  IsValidCodePage not implemented\n"));
+  dprintf(("KERNEL32:  IsValidCodePage %d not implemented", CodePage));
   return(TRUE);
 }

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.55 1999-11-09 19:22:32 sandervl Exp $
+# $Id: makefile,v 1.56 1999-11-11 19:10:09 sandervl Exp $
 
 #
@@ -18 +18 @@
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) /Tm+
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) /Tm+
+
+!ifdef NODEBUGINFO
+CFLAGS = $(CFLAGS) -DDEFAULT_LOGGING_OFF
+CXXFLAGS = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
+!endif
 
 !ifdef DEBUGALL

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.13 1999-10-25 21:38:50 phaller Exp $ */
+/* $Id: misc.cpp,v 1.14 1999-11-11 19:10:09 sandervl Exp $ */
 
 /*
@@ -252 +252 @@
     init = TRUE;
 
+#ifdef DEFAULT_LOGGING_OFF
+    if(getenv("WIN32LOG_ENABLED")) {
+#else
     if(!getenv("NOWIN32LOG")) {
+#endif
         char logname[CCHMAXPATH];
 

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.11 1999-11-09 14:19:47 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.12 1999-11-11 19:10:09 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
     imageVirtBase(-1), realBaseAddress(0), imageVirtEnd(0),
     nrNameExports(0), nrOrdExports(0), nameexports(NULL), ordexports(NULL),
-    pResSection(NULL), fImgMapping(0)
+    fImgMapping(0)
 {
  HFILE  dllfile;
@@ -140 +140 @@
  ULONG  filesize, ulRead;
  PIMAGE_SECTION_HEADER psh;
+ IMAGE_SECTION_HEADER sh;
  IMAGE_TLS_DIRECTORY *tlsDir = NULL;
  int    nSections, i;
@@ -315 +316 @@
      }
    }
-   fout << "*************************PE SECTIONS END **************************" << endl;
-   imageSize += imageVirtBase - oh.ImageBase;
-   fout << "Total size of Image " << imageSize << endl;
-   fout << "imageVirtBase       " << imageVirtBase << endl;
-   fout << "imageVirtEnd        " << imageVirtEnd << endl;
-
-   //In case there are any gaps between sections, adjust size
-   if(imageSize != imageVirtEnd - oh.ImageBase) {
+  }
+  else {
+        if(GetSectionHdrByName (win32file, &sh, ".rsrc")) 
+        {
+            addSection(SECTION_RESOURCE, (char *)win32file+sh.PointerToRawData,
+                       sh.SizeOfRawData, sh.VirtualAddress + oh.ImageBase,
+                       sh.Misc.VirtualSize);
+        }
+  }
+  fout << "*************************PE SECTIONS END **************************" << endl;
+  imageSize += imageVirtBase - oh.ImageBase;
+  fout << "Total size of Image " << imageSize << endl;
+  fout << "imageVirtBase       " << imageVirtBase << endl;
+  fout << "imageVirtEnd        " << imageVirtEnd << endl;
+
+  //In case there are any gaps between sections, adjust size
+  if(imageSize != imageVirtEnd - oh.ImageBase) {
         fout << "imageSize != imageVirtEnd - oh.ImageBase!" << endl;
         imageSize = imageVirtEnd - oh.ImageBase;
-   }
-   if(allocSections(reservedMem) == FALSE) {
+  }
+  if(allocSections(reservedMem) == FALSE) {
         fout << "Failed to allocate image memory, rc " << errorState << endl;
         goto failure;
-   }
-   fout << "OS/2 base address " << realBaseAddress << endl;
-   if(storeSections((char *)win32file) == FALSE) {
+  }
+  fout << "OS/2 base address " << realBaseAddress << endl;
+  if(storeSections((char *)win32file) == FALSE) {
         fout << "Failed to store sections, rc " << errorState << endl;
         goto failure;
-   }
-   if(oh.AddressOfEntryPoint) {
+  }
+  if(oh.AddressOfEntryPoint) {
         entryPoint = realBaseAddress + oh.AddressOfEntryPoint;
-   }
-   else {
+  }
+  else {
         fout << "EntryPoint == NULL" << endl; 
         entryPoint = NULL;
-   }
-
+  }
+
+  if(loadType == REAL_LOAD) 
+  {
    if(tlsDir != NULL) {
     Section *sect = findSection(SECTION_TLS);
@@ -381 +393 @@
         }
    }
-
-   //SvL: Use pointer to image header as module handle now. Some apps needs this
-   hinstance = (HINSTANCE)realBaseAddress;
-  }
+  }
+
+  //SvL: Use pointer to image header as module handle now. Some apps needs this
+  hinstance = (HINSTANCE)realBaseAddress;
 
   //PH: get pResDir pointer correct first, since processImports may
   //    implicitly call functions depending on it.
-  IMAGE_SECTION_HEADER sh;
   if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
         //get offset in resource object of directory entry
         pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
-        pResourceSectionStart = (ULONG)pResSection->virtaddr - oh.ImageBase;
+        pResourceSectionStart = sh.VirtualAddress;
   }
 
@@ -401 +412 @@
         goto failure;
    }
-
-   //set final memory protection flags (storeSections sets them to read/write)
-   if(setMemFlags() == FALSE) {
+  }
+ 
+  //set final memory protection flags (storeSections sets them to read/write)
+  if(setMemFlags() == FALSE) {
         fout << "Failed to set memory protection" << endl;
         goto failure;
-   }
-   CloseHandle(fImgMapping);
-   fImgMapping = 0;
-  }
+  }
+  CloseHandle(fImgMapping);
+  fImgMapping = 0;
+
   return(TRUE);
 failure:
@@ -428 +440 @@
   section[nrsections].virtaddr       = virtaddress;
 
-  if(type == SECTION_RESOURCE) {
-        pResSection = &section[nrsections];
-  }
   virtsize   = ((virtsize - 1) & ~0xFFF) + PAGE_SIZE;
   imageSize += virtsize;

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.48 1999-11-10 16:38:36 phaller Exp $ */
+/* $Id: wprocess.cpp,v 1.49 1999-11-11 19:10:09 sandervl Exp $ */
 
 /*
@@ -809 +809 @@
                         return(FALSE);
                 }
-                rsrcimg->init(0);
                 int size = rsrcimg->getVersionSize();
                 delete rsrcimg;