Changeset 4256 for trunk/src

Timestamp:

Sep 13, 2000, 11:11:00 PM (25 years ago)

Author:

sandervl

Message:

heap corruption fix (initcommandline) + handlemanager class for disks

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (7 diffs)
• dbglocal.cpp (modified) (2 diffs)
• dbglocal.h (modified) (2 diffs)
• hmdisk.cpp (added)
• hmdisk.h (added)
• hmfile.cpp (modified) (2 diffs)
• initsystem.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)
• oslibdos.cpp (modified) (2 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.48 2000-09-05 20:35:38 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.49 2000-09-13 21:10:56 sandervl Exp $ */
 
 /*
@@ -50 +50 @@
 #include "HandleManager.H"
 #include "HMDevice.h"
+#include "HMDisk.h"
 #include "HMOpen32.h"
 #include "HMEvent.h"
@@ -128 +129 @@
   HMDeviceHandler        *pHMEvent;        /* static instances of subsystems */
   HMDeviceHandler        *pHMFile;
+  HMDeviceHandler        *pHMDisk;
   HMDeviceHandler        *pHMMutex;
   HMDeviceHandler        *pHMSemaphore;
@@ -172 +174 @@
   PHMDEVICE pHMDevice;                     /* iterator over the device table */
 
-  if (pszDeviceName != NULL)
+  if (pszDeviceName != NULL) {
     for (pHMDevice = TabWin32Devices;  /* loop over all devices in the table */
          pHMDevice != NULL;
@@ -181 +183 @@
         return (pHMDevice->pDeviceHandler);    /* OK, we've found our device */
     }
+  }
+  int namelength = strlen(pszDeviceName);
+
+  //SvL: \\.\x:                 -> drive x (i.e. \\.\C:)
+  //     \\.\PHYSICALDRIVEn     -> drive n (n>=0)
+  if((strncmp(pszDeviceName, "\\\\.\\", 4) == 0) && 
+     namelength == 6 && pszDeviceName[5] == ':') 
+  {
+        return HMGlobals.pHMDisk;
+  }
+  if((strncmp(pszDeviceName, "\\\\.\\PHYSICALDRIVE", 17) == 0) && namelength == 18) {
+        return HMGlobals.pHMDisk;
+  }
 
   return (HMGlobals.pHMOpen32);    /* haven't found anything, return default */
@@ -359 +374 @@
     HMGlobals.pHMEvent      = new HMDeviceEventClass("\\\\EVENT\\");
     HMGlobals.pHMFile       = new HMDeviceFileClass("\\\\FILE\\");
+    HMGlobals.pHMDisk       = new HMDeviceDiskClass("\\\\DISK\\");
     HMGlobals.pHMMutex      = new HMDeviceMutexClass("\\\\MUTEX\\");
     HMGlobals.pHMSemaphore  = new HMDeviceSemaphoreClass("\\\\SEM\\");
@@ -387 +403 @@
   /* @@@PH we could deallocate the device list here */
 
-  delete HMGlobals.pHMOpen32;
-  delete HMGlobals.pHMEvent;
-  delete HMGlobals.pHMFile;
-  delete HMGlobals.pHMMutex;
-  delete HMGlobals.pHMSemaphore;
-  delete HMGlobals.pHMFileMapping;
-  delete HMGlobals.pHMComm;
+  if(HMGlobals.pHMOpen32) 
+        delete HMGlobals.pHMOpen32;
+  if(HMGlobals.pHMEvent) 
+        delete HMGlobals.pHMEvent;
+  if(HMGlobals.pHMFile) 
+        delete HMGlobals.pHMFile;
+  if(HMGlobals.pHMMutex) 
+        delete HMGlobals.pHMMutex;
+  if(HMGlobals.pHMSemaphore) 
+        delete HMGlobals.pHMSemaphore;
+  if(HMGlobals.pHMFileMapping) 
+        delete HMGlobals.pHMFileMapping;
+  if(HMGlobals.pHMComm) 
+        delete HMGlobals.pHMComm;
+  if(HMGlobals.pHMToken) 
+        delete HMGlobals.pHMToken;
+  if(HMGlobals.pHMThread) 
+        delete HMGlobals.pHMThread;
+  if(HMGlobals.pHMNamedPipe) 
+        delete HMGlobals.pHMNamedPipe;
+  if(HMGlobals.pHMDisk) 
+        delete HMGlobals.pHMDisk;
 
   return (NO_ERROR);

trunk/src/kernel32/dbglocal.cpp

@@ -1 @@
-/* $Id: dbglocal.cpp,v 1.9 2000-07-12 18:21:41 sandervl Exp $ */
+/* $Id: dbglocal.cpp,v 1.10 2000-09-13 21:10:58 sandervl Exp $ */
 
 /*
@@ -120 +120 @@
 "exceptstackdump",
 "hmfile",
-"hmnpipe"
+"hmnpipe",
+"hmdisk"
 };
 //******************************************************************************

trunk/src/kernel32/dbglocal.h

@@ -1 @@
-/* $Id: dbglocal.h,v 1.9 2000-07-12 18:21:42 sandervl Exp $ */
+/* $Id: dbglocal.h,v 1.10 2000-09-13 21:10:58 sandervl Exp $ */
 
 /*
@@ -120 +120 @@
 #define DBG_hmfile         98
 #define DBG_hmnpipe        99
-#define DBG_MAXFILES       100
+#define DBG_hmdisk         100
+#define DBG_MAXFILES       101
 
 extern USHORT DbgEnabled[DBG_MAXFILES];

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.20 2000-09-10 21:54:06 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.21 2000-09-13 21:10:59 sandervl Exp $ */
 
 /*
@@ -49 +49 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : TODO: \\.\PHYSICALDRIVEx opens physical drive x
  * Status    : NO_ERROR - API succeeded
  *             other    - what is to be set in SetLastError

trunk/src/kernel32/initsystem.cpp

@@ -1 @@
-/* $Id: initsystem.cpp,v 1.15 2000-09-10 21:54:06 sandervl Exp $ */
+/* $Id: initsystem.cpp,v 1.16 2000-09-13 21:10:59 sandervl Exp $ */
 /*
  * Odin system initialization (registry, directories & environment)
@@ -118 +118 @@
    RegCloseKey(hkey);
 
-   //CurrentVersion\RunOnce
+   //Software\Microsoft\Windows\CurrentVersion\RunOnce
    if(RegCreateKeyA(HKEY_LOCAL_MACHINE,"Software\\Microsoft\\Windows\\CurrentVersion\\RunOnce",&hkey)!=ERROR_SUCCESS) {
         dprintf(("InitRegistry: Unable to register system information (2)"));

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.100 2000-09-08 18:07:50 sandervl Exp $
+# $Id: makefile,v 1.101 2000-09-13 21:10:59 sandervl Exp $
 
 #
@@ -127 +127 @@
 $(OBJDIR)\hmthread.obj \
 $(OBJDIR)\hmnpipe.obj \
+$(OBJDIR)\hmdisk.obj \
 !ifdef DEBUG
 $(OBJDIR)\exceptstackdump.obj \

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.41 2000-09-12 04:27:44 bird Exp $ */
+/* $Id: oslibdos.cpp,v 1.42 2000-09-13 21:11:00 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -798 +798 @@
 #endif
 
+   if(strlen(lpszFile) == 2 && lpszFile[1] == ':') {
+        //app tries to open physical disk
+        openMode |= OPEN_FLAGS_DASD;
+   }
    int retry = 0;
    while(retry < 2)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.93 2000-09-12 22:47:58 bird Exp $ */
+/* $Id: wprocess.cpp,v 1.94 2000-09-13 21:11:00 sandervl Exp $ */
 
 /*
@@ -1119 +1119 @@
             while (*psz2 == ' ')            /* skip blanks after argv[1]. */
                 psz2++;
+            pszArg2 = psz2;  //SvL: bugfix -> fixes heap corruption
         }
         else