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

Timestamp:

Dec 9, 2001, 5:00:30 PM (24 years ago)

Author:

bird

Message:

Removed 'typedef struct _HMDEVICE'; bogus code.

File:

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

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.85 2001-12-08 15:12:15 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.86 2001-12-09 16:00:30 bird Exp $ */
 
 /*
@@ -85 +85 @@
  *****************************************************************************/
 
-typedef struct _HMDEVICE;
-
 typedef struct _HMHANDLE
 {
@@ -265 +263 @@
         //SvL: Mark handle as allocated here. Doing it outside of this function
         //     isn't thread safe. (and not very smart)
-        TabWin32Handles[ulLoop].hmHandleData.hHMHandle      = ulLoop; 
+        TabWin32Handles[ulLoop].hmHandleData.hHMHandle      = ulLoop;
         TabWin32Handles[ulLoop].hmHandleData.dwUserData     = 0;
         TabWin32Handles[ulLoop].hmHandleData.dwInternalType = HMTYPE_UNKNOWN;
@@ -435 +433 @@
 
     HMGlobals.fIsInitialized = TRUE;                             /* OK, done */
-    
+
 #if 1
-    //This is a very bad idea. \\\\.\\NTICE -> NTICE, if the file exits, then 
+    //This is a very bad idea. \\\\.\\NTICE -> NTICE, if the file exits, then
     //it will open the file instead of the device driver
     /* add standard symbolic links first, so local symbolic links in the
@@ -472 +470 @@
     }
 #endif
-    
+
     /* copy standard handles from OS/2's Open32 Subsystem */
     HMGlobals.pHMStandard   = new HMDeviceStandardClass("\\\\STANDARD_HANDLE\\");
@@ -585 +583 @@
            hHandleOS2));
 #endif
-  
+
   // @@@PH 2001-09-27
   // prevent too quick re-use of last handle
@@ -1036 +1034 @@
       lpFileName = szFilename;
     }
-      
-    
+
+
     pDeviceHandler = _HMDeviceFind((LPSTR)lpFileName);        /* find device */
     if (NULL == pDeviceHandler)                /* this name is unknown to us */
@@ -1103 +1101 @@
   if (rc != NO_ERROR)     /* oops, creation failed within the device handler */
   {
-    TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;  
-    
+    TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
+
     // Note:
     // device handlers have to return an Win32-style error code
@@ -1174 +1172 @@
   PHMHANDLEDATA   pHMHandleData;
   DWORD           rc;                                     /* API return code */
-  
+
   // name resolving
   CHAR szFilename[260];
@@ -1185 +1183 @@
     lpFileName = szFilename;
   }
-  
-  
+
+
   if(fuMode & OF_REOPEN) {
        pDeviceHandler = _HMDeviceFind((LPSTR)pOFStruct->szPathName);          /* find device */
@@ -1203 +1201 @@
   }
   else pDevData       = _HMDeviceGetData((LPSTR)lpFileName);
-  
+
 
   if(pDeviceHandler == HMGlobals.pHMOpen32) {
@@ -1918 +1916 @@
           // processes messages while waiting for the process to die)
           //(Napster install now doesn't block PM anymore (forcing a reboot))
- 
+
           HMODULE hUser32 = LoadLibraryA("USER32.DLL");
 
@@ -1941 +1939 @@
 
           while(TRUE) {
-              dwResult = HMMsgWaitForMultipleObjects(1, &hObject, FALSE, 
+              dwResult = HMMsgWaitForMultipleObjects(1, &hObject, FALSE,
                                                      INFINITE, QS_ALLINPUT);
               if(dwResult == WAIT_OBJECT_0 + 1) {
                   MSG msg ;
-   
-                  while (pfnPeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) 
+
+                  while (pfnPeekMessageA(&msg, NULL, 0, 0, PM_REMOVE))
                   {
                      if (msg.message == WM_QUIT) {
@@ -1954 +1952 @@
                          return WAIT_ABANDONED;
                      }
-   
+
                      /* otherwise dispatch it */
                      pfnDispatchMessageA(&msg);
-   
+
                   } // end of PeekMessage while loop
               }
@@ -2273 +2271 @@
   pHMHandleData->dwShare    = 0;
   pHMHandleData->dwCreation = 0;
-  pHMHandleData->dwFlags    = 0;    
+  pHMHandleData->dwFlags    = 0;
   pHMHandleData->lpHandlerData = NULL;
 
@@ -2543 +2541 @@
       }
   }
-  
+
   pDeviceHandler = HMGlobals.pHMSemaphore;               /* device is predefined */
 
@@ -3026 +3024 @@
  *****************************************************************************/
 
-DWORD  HMMsgWaitForMultipleObjects  (DWORD      cObjects, 
+DWORD  HMMsgWaitForMultipleObjects  (DWORD      cObjects,
                                      LPHANDLE   lphObjects,
                                      BOOL       fWaitAll,
@@ -4687 +4685 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -4748 +4746 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -4786 +4784 @@
  * Result    :
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL