Changeset 8840 for trunk/src/kernel32

Timestamp:

Jul 5, 2002, 7:59:30 PM (23 years ago)

Author:

sandervl

Message:

minor updates

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (5 diffs)
• hmdevio.cpp (modified) (7 diffs)
• hmdevio.h (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.63 2002-07-05 15:09:59 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.64 2002-07-05 17:59:30 sandervl Exp $ */
 
 /*
@@ -578 +578 @@
         rc = CurrentUnhExceptionFlt(lpexpExceptionInfo);
         if(rc != WINEXCEPTION_CONTINUE_SEARCH)
-        return rc;
-    }
-
+            return rc;
+    }
 
     if (DosQueryModFromEIP(&hmod, &iObj, sizeof(szModName), szModName, &offObj, (ULONG)lpexpExceptionInfo->ExceptionRecord->ExceptionAddress))
@@ -620 +619 @@
 
     case MBID_ABORT:
-       KillWin32Process();
-       // fall-through
-
     case MBID_RETRY:
     default:
@@ -1067 +1063 @@
     if(szExceptionLogFileName[0] == 0) {
         strcpy(szExceptionLogFileName, kernel32Path);
-        strcat(szExceptionLogFileName, "\\exception.log");
+        strcat(szExceptionLogFileName, "\\except.log");
     }
     rc = DosOpen(szExceptionLogFileName,         /* File path name */
@@ -1301 +1297 @@
         else    goto continuesearch; //pass on to OS/2 RTL or app exception handler
 
+        //Log fatal exception here
+        logException();
+
         dprintf(("KERNEL32: OS2ExceptionHandler: Continue and kill\n"));
         
-        //Log fatal exception here
-        logException();
-
         pCtxRec->ctx_RegEip = (ULONG)KillWin32Process;
         pCtxRec->ctx_RegEsp = pCtxRec->ctx_RegEsp + 0x10;

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.27 2002-04-29 16:28:37 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.28 2002-07-05 17:59:30 sandervl Exp $ */
 
 /*
@@ -64 +64 @@
     for(int i=0;i<nrKnownDrivers;i++) 
     {
-        driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
+            driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
                                     knownDriver[i].szOS2Name,
                                     knownDriver[i].fCreateFile,
                                     knownDriver[i].devIOCtl);
 
-        rc = HMDeviceRegister(knownDriver[i].szWin32Name, driver);
+            rc = HMDeviceRegister(knownDriver[i].szWin32Name, driver);
         if (rc != NO_ERROR)                                  /* check for errors */
                 dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n",
@@ -138 +138 @@
                                    LPCSTR lpDeviceName, LPVOID lpDriverData)
 {
- HMDeviceDriver *driver;
- DWORD rc;
+    HMCustomDriver *driver;
+    DWORD rc;
 
     dprintf(("RegisterCustomDriver %s", lpDeviceName));
@@ -158 +158 @@
 HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate, 
                                WINIOCTL pDevIOCtl)
-                : HMDeviceKernelObjectClass(lpDeviceName)
+                : HMDeviceHandler(lpDeviceName)
 {
     this->fCreateFile = fCreateFile;
@@ -167 +167 @@
 //******************************************************************************
 HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName)
-                : HMDeviceKernelObjectClass(lpDeviceName)
+                : HMDeviceHandler(lpDeviceName)
 {
 }
@@ -611 +611 @@
 BOOL WIN32API QueryPerformanceCounter(LARGE_INTEGER *lpPerformanceCount)
 {
- QWORD  time;
- APIRET rc;
-
-  rc = DosTmrQueryTime(&time);
-  if(rc) {
+    QWORD  time;
+    APIRET rc;
+
+    rc = DosTmrQueryTime(&time);
+    if(rc) {
         dprintf(("DosTmrQueryTime returned %d\n", rc));
         return(FALSE);
-  }
-  lpPerformanceCount->u.LowPart  = time.ulLo;
-  lpPerformanceCount->u.HighPart = time.ulHi;
-  return(TRUE);
+    }
+    lpPerformanceCount->u.LowPart  = time.ulLo;
+    lpPerformanceCount->u.HighPart = time.ulHi;
+    return(TRUE);
 }
 //******************************************************************************
@@ -627 +627 @@
 BOOL WIN32API QueryPerformanceFrequency(LARGE_INTEGER *lpFrequency)
 {
- APIRET  rc;
- ULONG   freq;
-
-  rc = DosTmrQueryFreq(&freq);
-  if(rc) {
+    APIRET  rc;
+    ULONG   freq;
+
+    rc = DosTmrQueryFreq(&freq);
+    if(rc) {
         dprintf(("DosTmrQueryFreq returned %d\n", rc));
         return(FALSE);
-  }
-  lpFrequency->u.LowPart  = freq;
-  lpFrequency->u.HighPart = 0;
-  dprintf2(("QueryPerformanceFrequency returned 0x%X%X\n", lpFrequency->u.HighPart, lpFrequency->u.LowPart));
-  return(TRUE);
-}
-//******************************************************************************
-//******************************************************************************
+    }
+    lpFrequency->u.LowPart  = freq;
+    lpFrequency->u.HighPart = 0;
+    dprintf2(("QueryPerformanceFrequency returned 0x%X%X\n", lpFrequency->u.HighPart, lpFrequency->u.LowPart));
+    return(TRUE);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/hmdevio.h

@@ -1 @@
-/* $Id: hmdevio.h,v 1.10 2002-01-12 10:28:17 sandervl Exp $ */
+/* $Id: hmdevio.h,v 1.11 2002-07-05 17:59:29 sandervl Exp $ */
 
 #ifndef __DEVIO_H__
@@ -116 +116 @@
  *****************************************************************************/
 
-class HMDeviceDriver : public HMDeviceKernelObjectClass
+class HMDeviceDriver : public HMDeviceHandler
 {
 public: