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

Timestamp:

Jan 22, 2001, 7:26:52 PM (25 years ago)

Author:

sandervl

Message:

memory map + handle manager fixes

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.59 2001-01-14 18:18:26 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.60 2001-01-22 18:26:49 sandervl Exp $ */
 
 /*
@@ -253 +253 @@
                                                        /* free handle found ? */
     if (INVALID_HANDLE_VALUE == TabWin32Handles[ulLoop].hmHandleData.hHMHandle) {
+        //SvL: Mark handle as taken here. Doing it outside of this function
+        //     isn't thread safe. (and not very smart)
+        TabWin32Handles[ulLoop].hmHandleData.hHMHandle      = ulLoop; 
         TabWin32Handles[ulLoop].hmHandleData.dwUserData     = 0;
         TabWin32Handles[ulLoop].hmHandleData.dwInternalType = HMTYPE_UNKNOWN;
@@ -1891 +1894 @@
                   while (pfnPeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
                   {
-                     if (msg.message == WM_QUIT)  return 1;
+                     if (msg.message == WM_QUIT) {
+                         dprintf(("ERROR: WaitForSingleObject call abandoned because WM_QUIT msg was received!!"));
+//                       teb->o.odin.fIgnoreMsgs = FALSE;
+                         FreeLibrary(hUser32);
+                         return WAIT_ABANDONED;
+                     }
    
                      /* otherwise dispatch it */
@@ -2637 +2645 @@
   PHMHANDLEDATA   pHMHandleData;
   DWORD           rc;                                     /* API return code */
-  HANDLE          hOldMemMap = -1;
 
   pDeviceHandler = HMGlobals.pHMFileMapping;         /* device is predefined */
@@ -2647 +2654 @@
     return 0;                           /* signal error */
   }
-
 
                            /* initialize the complete HMHANDLEDATA structure */
@@ -2658 +2664 @@
   pHMHandleData->lpHandlerData = NULL;
 
-
       /* we've got to mark the handle as occupied here, since another device */
                    /* could be created within the device handler -> deadlock */
@@ -2676 +2681 @@
                                          dwMaximumSizeHigh,
                                          dwMaximumSizeLow,
-                                         lpName, &hOldMemMap);
-
-  if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
-  {
-      TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-      SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
-    if(rc == ERROR_ALREADY_EXISTS) {
-    return hOldMemMap; //return handle of existing file mapping
-  }
-  else  return (NULL);                                           /* signal error */
+                                         lpName);
+
+  if(rc != NO_ERROR)     /* oops, creation failed within the device handler */
+  {
+      if(rc != ERROR_ALREADY_EXISTS) {
+          TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+          SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
+          return (NULL);                                           /* signal error */
+      }
+      SetLastError(ERROR_ALREADY_EXISTS);
+      return iIndexNew;                                   /* return valid handle */
   }
   else
@@ -4458 +4464 @@
   if (-1 == iIndexNewWrite)                         /* oops, no free handles ! */
   {
+    //free handle
+    TabWin32Handles[iIndexNewRead].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
     SetLastError(ERROR_NOT_ENOUGH_MEMORY);      /* use this as error message */
     return 0;