Changeset 7474 for trunk/src

Timestamp:

Nov 29, 2001, 12:33:37 AM (24 years ago)

Author:

phaller

Message:

Fixes in HandleManager and Device Handlers

Location:

trunk/src/kernel32

Files:

• HandleManager.cpp (modified) (4 diffs)
• handlenames.cpp (modified) (1 diff)
• hmcomm.cpp (modified) (5 diffs)
• hmdevio.cpp (modified) (6 diffs)
• hmdisk.cpp (modified) (4 diffs)
• hmfile.cpp (modified) (4 diffs)
• hmmailslot.cpp (modified) (3 diffs)
• hmnpipe.cpp (modified) (2 diffs)
• hmparport.cpp (modified) (6 diffs)
• oslibdos.cpp (modified) (3 diffs)

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.78 2001-11-28 15:45:45 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.79 2001-11-28 23:33:34 phaller Exp $ */
 
 /*
@@ -432 +432 @@
 
     HMGlobals.fIsInitialized = TRUE;                             /* OK, done */
-
+    
+#if 1
+    //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
+     * device handlers get precedence over the default here.
+     *
+     * Device handlers are supposed to place the appropriate
+     * symbolic links such as "\\.\\COM1", "COM1"
+     *
+     * - "\\.\f:\temp\readme.txt" is a valid file
+     * - "com1" is a valid device in case serial port 1 exists,
+     *   otherwise it'd be a valid file.
+     * - "\\.\filename" is the only misleading case (to be verified)
+     *
+     * Note:
+     * the Open32 "device" definately MUST be the last device to be
+     * asked to accept the specified name.
+     */
+    {
+      // strings are placed in read-only segment
+      PSZ pszDrive  = strdup("\\\\.\\x:");
+      PSZ pszDrive2 = strdup("\\\\.\\x:");
+      for (char ch = 'A'; ch <= 'Z'; ch++)
+      {
+        pszDrive[4] = ch;
+        pszDrive2[4] = ch;
+        HandleNamesAddSymbolicLink(pszDrive, pszDrive+4);
+        HandleNamesAddSymbolicLink(pszDrive2, pszDrive2+4);
+      }
+      free(pszDrive);
+      free(pszDrive2);
+      HandleNamesAddSymbolicLink("\\\\?\\UNC\\", "\\\\");
+    }
+#endif
+    
     /* copy standard handles from OS/2's Open32 Subsystem */
     HMGlobals.pHMStandard   = new HMDeviceStandardClass("\\\\STANDARD_HANDLE\\");
@@ -453 +488 @@
     HMGlobals.pHMMailslot   = new HMMailslotClass("\\MAILSLOT\\");
     HMGlobals.pHMParPort    = new HMDeviceParPortClass("\\\\LPT\\");
-    
-#if 0
-    //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 */
-    HandleNamesAddSymbolicLink("\\\\.\\", "");
-#endif
   }
   return (NO_ERROR);
@@ -1070 +1098 @@
   {
     TabWin32Handles[iIndexNew].hmHandleData.hHMHandle = INVALID_HANDLE_VALUE;
-    SetLastError(rc);          /* Hehe, OS/2 and NT are pretty compatible :) */
+    
+    
+    // Note:
+    // device handlers have to return an Win32-style error code
+    // from CreateFile() !
+    SetLastError(rc);
     return (INVALID_HANDLE_VALUE);                           /* signal error */
   }

trunk/src/kernel32/handlenames.cpp

@@ -170 +170 @@
     if (fCaseInsensitive)
     {
-      if (strnicmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
-        return pHandleName;
+      // Note: pszSymbolicLink must either terminate at [iLen] or
+      // have a delimiter.
+      if ( (pszSymbolicLink[iLen] == '\\') ||
+           (pszSymbolicLink[iLen] == 0) )
+        if (strnicmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
+          return pHandleName;
     }
     else
     {
-      if (strncmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
-        return pHandleName;
+      if ( (pszSymbolicLink[iLen] == '\\') ||
+           (pszSymbolicLink[iLen] == 0) )
+        if (strncmp(pHandleName->pszSymbolicLink, pszSymbolicLink, iLen) == 0)
+          return pHandleName;
     }
     

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.17 2001-11-28 15:35:15 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.18 2001-11-28 23:33:35 phaller Exp $ */
 
 /*
@@ -19 +19 @@
 #include <string.h>
 #include <handlemanager.h>
+#include "handlenames.h"
 #include <heapstring.h>
 #include "hmdevice.h"
@@ -91 +92 @@
   if(pData!= NULL)
     HMDeviceRegisterEx("COM1", this, pData);
+  
+  // add symbolic links to the "real name" of the device
+  {
+    // @@@PH what's the long device name: SerialPortx ?
+    // HandleNamesAddSymbolicLink("\\Device\\ParallelPort3", "COM3");
+    
+    PSZ pszCOM = strdup("\\\\.\\COMx");
+    for (char ch = '1'; ch <= '9'; ch++)
+    {
+      pszCOM[7] = ch;
+      HandleNamesAddSymbolicLink(pszCOM, pszCOM+4);
+    }
+    free(pszCOM);
+  }
 }
 
@@ -109 +124 @@
 {
     dprintf2(("HMDeviceCommClass::FindDevice %s %s", lpClassDevName, lpDeviceName));
-
-    if(namelength > 5) {
-        if(namelength != 9 || lstrncmpA(lpDeviceName, "\\\\.\\", 4) != 0) {
-            return FALSE;  //can't be com name
-        }
-        lpDeviceName += 4; //skip prefix
-    }
-
+  
     //first 3 letters 'COM'?
     if(lstrncmpiA(lpDeviceName, lpClassDevName, 3) != 0) {
@@ -207 +215 @@
     {
       delete pHMHandleData->lpHandlerData;
-      return rc;
+      return error2WinError(rc);
     }
     rc = SetBaud(pHMHandleData,9600);

trunk/src/kernel32/hmdevio.cpp

@@ -1 @@
-/* $Id: hmdevio.cpp,v 1.17 2001-11-26 17:16:24 sandervl Exp $ */
+/* $Id: hmdevio.cpp,v 1.18 2001-11-28 23:33:35 phaller Exp $ */
 
 /*
@@ -30 +30 @@
 #include "map.h"
 #include "exceptutil.h"
+#include "oslibdos.h"
 
 #define DBG_LOCALLOG    DBG_hmdevio
@@ -111 +112 @@
                 {
                     HINSTANCE hDrvDll = LoadLibraryA(szDllName);
-                    if(hDrvDll) {
+                    if(hDrvDll)
+                    {
                         sprintf(szDrvName, "\\\\.\\%s", szKeyName);
                         driver = new HMCustomDriver(hDrvDll, szDrvName);
@@ -117 +119 @@
                         rc = HMDeviceRegister(szDrvName, driver);
                         if (rc != NO_ERROR)                                  /* check for errors */
-                              dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
+                          dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
+                      
+                        // @@@PH
+                        // there should be an symbolic link:
+                        // "\\.\drvname$" -> "drvname$"
                     }
                 }
@@ -217 +223 @@
         if(rc) {
                 dprintf(("DosSetRelMaxFH returned %d", rc));
-                return rc;
+                return error2WinError(rc);
         }
         dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
@@ -225 +231 @@
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 
-  if(rc == NO_ERROR) {
-        pHMHandleData->hHMHandle = hfFileHandle;
-        return (NO_ERROR);
-  }
-  else  return(rc);
+  if(rc == NO_ERROR) 
+  {
+    pHMHandleData->hHMHandle = hfFileHandle;
+    return (NO_ERROR);
+  }
+  else  
+    return(error2WinError(rc));
 }
 //******************************************************************************

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.29 2001-11-26 14:54:01 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.30 2001-11-28 23:33:36 phaller Exp $ */
 
 /*
@@ -67 +67 @@
 BOOL HMDeviceDiskClass::FindDevice(LPCSTR lpClassDevName, LPCSTR lpDeviceName, int namelength)
 {
+  // @@@PH
+  // this is broken:
+  // "\\.\C:" and "C:" is a LOGICAL drive
+  // \\.\PHYSICALDRIVEx is a PHYSICAL drive!
+  
     //\\.\x:                -> length 6
     //\\.\PHYSICALDRIVEn    -> length 18
@@ -109 +114 @@
         return ERROR_INVALID_PARAMETER;
     }
-    if(strncmp(lpFileName,       // "support" for local unc names
-             "\\\\.\\",
-             4) == 0)
-    {
-        lpFileName+=4;
-    }
 
     //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
@@ -206 +205 @@
     filename[2] = 0;
 
-    //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
+    //Disable error popups. NT allows an app to open a cdrom/dvd drive without a disk inside
     //OS/2 fails in that case with error ERROR_NOT_READY
     ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.30 2001-11-26 14:54:01 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.31 2001-11-28 23:33:36 phaller Exp $ */
 
 /*
@@ -49 +49 @@
  * Variables :
  * Result    :
- * Remark    : TODO: \\.\PHYSICALDRIVEx opens physical drive x
+ * Remark    : 
  * Status    : NO_ERROR - API succeeded
  *             other    - what is to be set in SetLastError
@@ -72 +72 @@
            lpSecurityAttributes,
            pHMHandleDataTemplate));
-
-  if(strncmp(lpFileName,       // "support" for local unc names
-             "\\\\.\\",
-             4) == 0)
-  {
-        lpFileName+=4;
-  }
-  else {
-        ParsePath(lpFileName, filepath, sizeof(filepath));
-        lpFileName = filepath;
-  }
-
+  
+  ParsePath(lpFileName, filepath, sizeof(filepath));
+  lpFileName = filepath;
 
   // create from template
@@ -180 +171 @@
     }
 
-    if(strcmp(lpFileName,       // "support" for local unc names
-             "\\\\.\\") == 0)
-    {
-        lpFileName+=4;
-    }
-    else
     if(!strchr(lpFileName, ':') && !strchr(lpFileName, '\\'))
     {

trunk/src/kernel32/hmmailslot.cpp

@@ -1 @@
-/* $Id: hmmailslot.cpp,v 1.3 2001-11-26 14:54:02 sandervl Exp $
+/* $Id: hmmailslot.cpp,v 1.4 2001-11-28 23:33:36 phaller Exp $
  *
  * Win32 mailslot APIs
@@ -190 +190 @@
 
   char *pipename = (char *)alloca(strlen(lpFileName)+16);
-  if(pipename == NULL) {
-      DebugInt3();
-      SetLastError(ERROR_NOT_ENOUGH_MEMORY);
-      return FALSE;
+  if(pipename == NULL) 
+  {
+    DebugInt3();
+    return ERROR_NOT_ENOUGH_MEMORY;
   }
   strcpy(pipename, "\\\\.\\pipe\\");
@@ -215 +215 @@
   //todo: lookup name and fail if exists
   mailslot = new HMMailSlotInfo(lpFileName, hPipe, -1, 0, FALSE, (LPSECURITY_ATTRIBUTES)lpSecurityAttributes);
-  if(mailslot == NULL) {
-      DebugInt3();
-      return ERROR_NOT_ENOUGH_MEMORY;
+  if(mailslot == NULL) 
+  {
+    DebugInt3();
+    return ERROR_NOT_ENOUGH_MEMORY;
   }
   pHMHandleData->dwUserData = (DWORD)mailslot;

trunk/src/kernel32/hmnpipe.cpp

@@ -1 @@
-/* $Id: hmnpipe.cpp,v 1.4 2001-11-26 14:54:02 sandervl Exp $ */
+/* $Id: hmnpipe.cpp,v 1.5 2001-11-28 23:33:37 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -140 +140 @@
                                                pHMHandleData->dwCreation,
                                                pHMHandleData->dwFlags);
-   if(pHMHandleData->hHMHandle == -1) {
-      return GetLastError();
-   }
-   return ERROR_SUCCESS;
+  if(pHMHandleData->hHMHandle == -1) 
+  {
+    return GetLastError();
+  }
+  return ERROR_SUCCESS;
 }
 

trunk/src/kernel32/hmparport.cpp

@@ -1 @@
-/* $Id: hmparport.cpp,v 1.8 2001-11-26 14:54:03 sandervl Exp $ */
+/* $Id: hmparport.cpp,v 1.9 2001-11-28 23:33:37 phaller Exp $ */
 
 /*
@@ -152 +152 @@
   
   // add symbolic links to the "real name" of the device
-  HandleNamesAddSymbolicLink("\\Device\\ParallelPort1", "LPT1");
-  HandleNamesAddSymbolicLink("\\Device\\ParallelPort2", "LPT2");
-  HandleNamesAddSymbolicLink("\\Device\\ParallelPort3", "LPT3");
+  {
+    PSZ pszLPT = strdup("\\\\.\\LPTx");
+    PSZ pszLPT2 = strdup("\\Device\\ParallelPort1");
+    for (char ch = '1'; ch <= '3'; ch++)
+    {
+      pszLPT[7] = ch;
+      pszLPT2[20] = ch;
+      HandleNamesAddSymbolicLink(pszLPT, pszLPT+4);
+      HandleNamesAddSymbolicLink(pszLPT2, pszLPT+4);
+    }
+    free(pszLPT);
+    free(pszLPT2);
+  }
 }
 
@@ -172 +182 @@
 BOOL HMDeviceParPortClass::FindDevice(LPCSTR lpClassDevName, LPCSTR lpDeviceName, int namelength)
 {
-  dprintf(("HMDeviceParPortClass::FindDevice(%s,%s)\n",
-           lpClassDevName,
-           lpDeviceName));
-  
+  // can be both, "LPT1" and "LPT1:"
     if(namelength > 5)
         return FALSE;  //can't be lpt name
@@ -208 +215 @@
            pHMHandleDataTemplate));
   
- char comname[6];
+ char lptname[6];
 
   dprintf(("HMDeviceParPortClass: Parallel port %s open request\n", lpFileName));
 
-  if(strlen(lpFileName) > 5) {
-    return -1;  //safety check (unnecessary..)
-  }
-  pHMHandleData->hHMHandle = 0;
-
-  strcpy(comname, lpFileName);
-  comname[4] = 0;   //get rid of : (if present) (eg LPT1:)
+  strcpy(lptname, lpFileName);
+  lptname[4] = 0;   //get rid of : (if present) (eg LPT1:)
 
   //AH: TODO parse Win32 security handles
   ULONG oldmode = SetErrorMode(SEM_FAILCRITICALERRORS);
-  pHMHandleData->hHMHandle = OSLibDosOpen(comname,
+  pHMHandleData->hHMHandle = OSLibDosOpen(lptname,
                                           OSLIB_ACCESS_READWRITE |
                                           OSLIB_ACCESS_SHAREDENYREAD |
                                           OSLIB_ACCESS_SHAREDENYWRITE);
   SetErrorMode(oldmode);
-
+  
+  // check if handle could be opened properly
+  if (0 == pHMHandleData->hHMHandle)
+  {
+    // @@@PH we need to get an OS/2 return code from OSLibDosOpen!
+    // and translate it via error2WinError
+    return ERROR_ACCESS_DENIED; // signal failure
+  }
+  
 #if 0
   if (pHMHandleData->hHMHandle != 0)
@@ -256 +266 @@
              " XON Char               : 0x%x\n"
              " XOFF Char              : 0x%x\n",
-             comname,
+             lptname,
              ((PHMDEVCOMDATA)pHMHandleData->lpHandlerData)->dcbOS2.usWriteTimeout,
              ((PHMDEVCOMDATA)pHMHandleData->lpHandlerData)->dcbOS2.usReadTimeout,
@@ -610 +620 @@
 #endif
   
-  return(rc==0);
+  return(rc==NO_ERROR);
 }
 

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.85 2001-11-19 13:02:58 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.86 2001-11-28 23:33:37 phaller Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -178 +178 @@
     case ERROR_WRITE_PROTECT: //19
         return ERROR_WRITE_PROTECT_W;
+  
+    case ERROR_BAD_UNIT: //20
+        return ERROR_BAD_UNIT_W;
 
     case ERROR_NOT_READY: //21
@@ -604 +607 @@
                os2flags,
                0L);                            /* No extended attribute */
-
-  if(rc) {
-        if(rc == ERROR_TOO_MANY_OPEN_FILES) {
-         ULONG CurMaxFH;
-         LONG  ReqCount = 32;
-
-                rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
-                if(rc) {
-                        dprintf(("DosSetRelMaxFH returned %d", rc));
-                        return 0;
-                }
-                dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
-                goto tryopen;
-        }
+  if(rc) 
+  {
+    if(rc == ERROR_TOO_MANY_OPEN_FILES) 
+    {
+      ULONG CurMaxFH;
+      LONG  ReqCount = 32;
+
+      rc = DosSetRelMaxFH(&ReqCount, &CurMaxFH);
+      if(rc) 
+      {
+        dprintf(("DosSetRelMaxFH returned %d", rc));
         return 0;
-  }
-  else  return hFile;
+      }
+      dprintf(("DosOpen failed -> increased nr open files to %d", CurMaxFH));
+      goto tryopen;
+    }
+    
+    SetLastError(error2WinError(rc));
+    return 0;
+  }
+  
+  // OK, file was opened
+  SetLastError(ERROR_SUCCESS_W);
+  return hFile;
 }
 //******************************************************************************