Changeset 7492 for trunk/src/kernel32/hmdisk.cpp

Timestamp:

Nov 29, 2001, 5:33:01 PM (24 years ago)

Author:

phaller

Message:

fix issues caused by OSLibDosDevIOCtl return code change and hmdisk's FindDevice()

File:

• trunk/src/kernel32/hmdisk.cpp (modified) (9 diffs)

trunk/src/kernel32/hmdisk.cpp

@@ -1 @@
-/* $Id: hmdisk.cpp,v 1.31 2001-11-29 13:38:51 sandervl Exp $ */
+/* $Id: hmdisk.cpp,v 1.32 2001-11-29 16:33:01 phaller Exp $ */
 
 /*
@@ -67 +67 @@
 BOOL HMDeviceDiskClass::FindDevice(LPCSTR lpClassDevName, LPCSTR lpDeviceName, int namelength)
 {
+  // check for "x:"
+  if (namelength == 2)
+  {
+    if (lpDeviceName[1] != ':')
+      return FALSE;
+
+    if ( (lpDeviceName[0] < 'A') ||
+         (lpDeviceName[0] > 'Z') )
+      return FALSE;
+
+    return TRUE;
+  }
+  
     //\\.\x:                -> length 6
     //\\.\PHYSICALDRIVEn    -> length 18
@@ -109 +122 @@
         return ERROR_INVALID_PARAMETER;
     }
+  
+#if 0
+  // will never be triggered
     if(strncmp(lpFileName,       // "support" for local unc names
              "\\\\.\\",
@@ -115 +131 @@
         lpFileName+=4;
     }
+#endif
 
     //Disable error popus. NT allows an app to open a cdrom/dvd drive without a disk inside
@@ -274 +291 @@
                          0,
                          &dwDataSize);
-  if(ret)
-  {
-    SetLastError(error2WinError(ret));
-    return FALSE;
-  }
-  SetLastError(ERROR_SUCCESS);
-  return TRUE;
+  return (ret == ERROR_SUCCESS);
 }
 
@@ -319 +330 @@
                          0,
                          &dwDataSize);
-  if(ret)
-  {
-    SetLastError(error2WinError(ret));
-    return FALSE;
-  }
-  SetLastError(ERROR_SUCCESS);
-  return TRUE;
+  return (ret == ERROR_SUCCESS);
 }
 
@@ -792 +797 @@
                              0,
                              &dwDataSize);
-      if(ret)
-      {
-        SetLastError(error2WinError(ret));
-        return FALSE;
-      }
-      SetLastError(ERROR_SUCCESS);
-      return TRUE;
+      return (ret == ERROR_SUCCESS);
     }
       
@@ -844 +843 @@
                                volbuf, 8, &datasize);
 
-        if(ret) {
-            SetLastError(error2WinError(ret));
-            return FALSE;
-        }
+        if(ret)
+            return FALSE;
+
         if(lpBytesReturned) {
             *lpBytesReturned = sizeof(VOLUME_CONTROL);
@@ -886 +884 @@
                                volbuf, 8, &datasize);
 
-        if(ret) {
-            SetLastError(error2WinError(ret));
-            return FALSE;
-        }
+        if(ret)
+            return FALSE;
+
         SetLastError(ERROR_SUCCESS);
         return TRUE;