Changeset 21339 for trunk/src/kernel32/HandleManager.cpp

Timestamp:

Aug 14, 2009, 5:18:10 PM (16 years ago)

Author:

vladest

Message:

1. Attempt to add support for DosAllocMem at specific address
2. Fixed crashes in Handle manager when its tries to access non initialized pointer

File:

• trunk/src/kernel32/HandleManager.cpp (modified) (27 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -85 +85 @@
 // this is the size of our currently static handle table
 #define MAX_OS2_HMHANDLES       (4*1024)
-
+#define ERROR_SYS_INTERNAL      328
 
 /*****************************************************************************
@@ -589 +589 @@
   if (HMGlobals.fIsInitialized != TRUE)
   {
-  
-#ifdef RAS  
-    RasRegisterObjectTracking(&rthHandles, "KERNEL32 handles", 
-                              0, RAS_TRACK_FLAG_LOGOBJECTCONTENT, 
+
+#ifdef RAS
+    RasRegisterObjectTracking(&rthHandles, "KERNEL32 handles",
+                              0, RAS_TRACK_FLAG_LOGOBJECTCONTENT,
                               LogObjectContent_Handle, NULL);
 #endif
@@ -1504 +1504 @@
 
   /*
-   * Based on testcase (5) and MSDN: 
+   * Based on testcase (5) and MSDN:
    *      "OF_PARSE   Fills the OFSTRUCT structure but carries out no other action."
    */
@@ -1778 +1778 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   fResult = pHMHandle->pDeviceHandler->ReadFile(&pHMHandle->hmHandleData,
                                                 lpBuffer,
@@ -1829 +1833 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   fResult = pHMHandle->pDeviceHandler->WriteFile(&pHMHandle->hmHandleData,
                                                  lpBuffer,
@@ -1866 +1874 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->GetFileType(&pHMHandle->hmHandleData);
 
@@ -1906 +1918 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->_DeviceRequest(&pHMHandle->hmHandleData,
                                                        ulRequestCode,
@@ -1912 +1928 @@
                                                        arg3,
                                                        arg4);
-
   return (dwResult);                                  /* deliver return code */
 }
@@ -1945 +1960 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->GetFileInformationByHandle(&pHMHandle->hmHandleData,
                                                        pHFI);
@@ -1979 +1998 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   bResult = pHMHandle->pDeviceHandler->SetEndOfFile(&pHMHandle->hmHandleData);
 
@@ -2015 +2038 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   bResult = pHMHandle->pDeviceHandler->SetFileTime(&pHMHandle->hmHandleData,
                                                    (LPFILETIME)pFT1,
@@ -2051 +2078 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   bResult = pHMHandle->pDeviceHandler->GetFileTime(&pHMHandle->hmHandleData,
                                                    (LPFILETIME)pFT1,
@@ -2087 +2118 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->GetFileSize(&pHMHandle->hmHandleData,
                                                     pSize);
@@ -2133 +2168 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->SetFilePointer(&pHMHandle->hmHandleData,
                                                        lDistanceToMove,
@@ -2195 +2234 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->LockFile(&pHMHandle->hmHandleData,
                                                  arg2,
@@ -2242 +2285 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->LockFileEx(&pHMHandle->hmHandleData,
                                                    dwFlags,
@@ -2285 +2332 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->UnlockFile(&pHMHandle->hmHandleData,
                                                    arg2,
@@ -2330 +2381 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->UnlockFileEx(&pHMHandle->hmHandleData,
                                                      dwReserved,
@@ -2430 +2485 @@
   }
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->WaitForSingleObject(&pHMHandle->hmHandleData,
                                                             dwTimeout);
@@ -2466 +2525 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->WaitForSingleObjectEx(&pHMHandle->hmHandleData,
                                                               dwTimeout,
@@ -2501 +2564 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->FlushFileBuffers(&pHMHandle->hmHandleData);
 
@@ -2537 +2604 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->GetOverlappedResult(&pHMHandle->hmHandleData,
                                                             lpOverlapped,
@@ -2573 +2644 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->ReleaseMutex(&pHMHandle->hmHandleData);
 
@@ -2920 +2995 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   dwResult = pHMHandle->pDeviceHandler->ReleaseSemaphore(&pHMHandle->hmHandleData,
                                                          cReleaseCount,
@@ -3108 +3187 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return NULL;
+
   lpResult = pHMHandle->pDeviceHandler->MapViewOfFileEx(&pHMHandle->hmHandleData,
                                                       dwDesiredAccess,
@@ -3320 +3403 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   fResult = pHMHandle->pDeviceHandler->DeviceIoControl(&pHMHandle->hmHandleData,
                                                 dwIoControlCode,
@@ -3371 +3458 @@
 
   pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+
+  if (!pHMHandle || !pHMHandle->pDeviceHandler)
+      return ERROR_SYS_INTERNAL;
+
   fResult = pHMHandle->pDeviceHandler->CancelIo(&pHMHandle->hmHandleData);