Changeset 612 for trunk/src

Timestamp:

Aug 21, 1999, 9:47:30 PM (26 years ago)

Author:

sandervl

Message:

Logging change, DosAllocMem for Aurora change (PE loader) + fixed AllocFixedMem

Location:

trunk/src/kernel32

Files:

• initterm.cpp (modified) (3 diffs)
• misc.cpp (modified) (2 diffs)
• winimage.cpp (modified) (6 diffs)

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.10 1999-08-17 16:35:09 phaller Exp $ */
+/* $Id: initterm.cpp,v 1.11 1999-08-21 19:47:29 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 void CDECL _ctordtorTerm( void );
 }
+
+void CloseLogFile(); //misc.cpp
 
 /* Tue 03.03.1998: knut */
@@ -128 +130 @@
 {
     dprintf(("kernel32 exit %d\n", ulReason));
+    CloseLogFile();
     WriteOutProfiles();
     _ctordtorTerm();

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.6 1999-08-06 12:15:25 phaller Exp $ */
+/* $Id: misc.cpp,v 1.7 1999-08-21 19:47:30 sandervl Exp $ */
 
 /*
@@ -273 +273 @@
 }
 
+void CloseLogFile()
+{
+  USHORT  sel = RestoreOS2FS();
+  fclose(flog);
+  SetFS(sel);
+}
+
+
 int SYSTEM EXPORT WriteLogError(char *tekst, ...)
 {

trunk/src/kernel32/winimage.cpp

@@ -1 @@
-/* $Id: winimage.cpp,v 1.11 1999-08-18 17:18:01 sandervl Exp $ */
+/* $Id: winimage.cpp,v 1.12 1999-08-21 19:47:30 sandervl Exp $ */
 
 /*
@@ -53 +53 @@
 ULONG MissingApi();
 char *hex(ULONG num);
+
+extern ULONG flAllocMem;    /*Tue 03.03.1998: knut */
 
 //******************************************************************************
@@ -469 +471 @@
   if(GetSectionHdrByName (win32file, &sh, ".rsrc")) {
         //get offset in resource object of directory entry
-        pResDir = (PIMAGE_RESOURCE_DIRECTORY)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE);
+//      pResDir = (PIMAGE_RESOURCE_DIRECTORY)ImageDirectoryOffset(win32file, IMAGE_DIRECTORY_ENTRY_RESOURCE);
+        pResDir = (PIMAGE_RESOURCE_DIRECTORY)(sh.VirtualAddress + realBaseAddress);
   }
 
@@ -522 +525 @@
         return allocFixedMem(reservedMem);
   }
-  rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ);
+  rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | flAllocMem);
   if(rc) {
         errorState = rc;
@@ -583 +586 @@
 
   while(TRUE) {
-        rc = DosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ);
+        rc = DosAllocMem((PPVOID)&address, FALLOC_SIZE, PAG_READ | flAllocMem);
         if(rc) break;
 
@@ -595 +598 @@
                 DosFreeMem((PVOID)address);
 
-                diff = address - oh.ImageBase;
+                diff = oh.ImageBase - address;
                 if(diff) {
-                        rc = DosAllocMem((PPVOID)&address, diff, PAG_READ);
+                        rc = DosAllocMem((PPVOID)&address, diff, PAG_READ | flAllocMem);
                         if(rc) break;
                 }
-                rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ);
+                rc = DosAllocMem((PPVOID)&baseAddress, imageSize, PAG_READ | flAllocMem);
                 if(rc) break;