Changeset 8261

Timestamp:

Apr 13, 2002, 9:41:31 AM (23 years ago)

Author:

bird

Message:

Hot fix for 0 CDROMs. first try!

File:

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

trunk/src/kernel32/oslibdos.cpp ¶

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.97 2002-04-13 06:31:53 bird Exp $ */
+/* $Id: oslibdos.cpp,v 1.98 2002-04-13 07:41:31 bird Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -12 +12 @@
  *
  */
+
+
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #define INCL_BASE
 #define INCL_DOSEXCEPTIONS
@@ -38 +44 @@
 #include "dbglocal.h"
 
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+#ifndef DEVTYPE_OPTICAL
+#define DEVTYPE_OPTICAL                    0x0008
+#endif
+
+#define IOC_CDROM_2                 0x82 /* from cdioctl.h (ddk, os2cdrom.dmd sample) */
+#define IOCD_RETURN_DRIVE_LETTER    0x60
+
+
+// used for input to logical disk Get device parms Ioctl
+#pragma pack(1)
+typedef struct
+{
+    UCHAR   Infotype;
+    UCHAR   DriveUnit;
+} DSKREQ;
+
+/*------------------------------------------------*
+ * Cat 0x82, Func 0x60:  Return Drive Letter Info *
+ *------------------------------------------------*/
+typedef struct DriveLetter_Data
+{
+    USHORT  drive_count;
+    USHORT  first_drive_number;
+} CDDRVLTR;
+#pragma pack()
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 static PROC_DosSetFileSizeL  DosSetFileSizeLProc = 0;
 static PROC_DosSetFilePtrL   DosSetFilePtrLProc   = 0;
@@ -44 +84 @@
 static BOOL f64BitIO = FALSE;
 
+/* first user queries the data */
+static  CDDRVLTR    cdDrvLtr = {0xffff, 0xffff};
+
+
+/*******************************************************************************
+*   Functions Prototypes.                                                      *
+*******************************************************************************/
 BOOL WINAPI CharToOemA( LPCSTR s, LPSTR d );
 BOOL WINAPI OemToCharA( LPCSTR s, LPSTR d );
+
+
+
 
 //******************************************************************************
@@ -2631 +2681 @@
 #define DisketteCylinders 80
 
-#ifndef DEVTYPE_OPTICAL
-#define DEVTYPE_OPTICAL                    0x0008
-#endif
-
-// used for input to logical disk Get device parms Ioctl
-#pragma pack(1)
-typedef struct
-{
-    UCHAR   Infotype;
-    UCHAR   DriveUnit;
-} DSKREQ;
-
-/*------------------------------------------------*
- * Cat 0x82, Func 0x60:  Return Drive Letter Info *
- *------------------------------------------------*/
-typedef struct DriveLetter_Data
-{
-    USHORT  drive_count;
-    USHORT  first_drive_number;
-} CDDRVLTR;
-#pragma pack()
 
 
@@ -2706 +2735 @@
      * exactly very dynamic when it comes to this info.
      */
-    static  CDDRVLTR    cdDrvLtr = {0xffff, 0xffff};
     if (cdDrvLtr.drive_count == 0xffff)
     {
@@ -2717 +2745 @@
             == NO_ERROR)
         {
-            #define IOC_CDROM_2                 0x82 /* from cdioctl.h (ddk, os2cdrom.dmd sample) */
-            #define IOCD_RETURN_DRIVE_LETTER    0x60
             cbData = sizeof(cdDrvLtr);
             rc = DosDevIOCtl(hCDRom2,
@@ -2727 +2753 @@
             DosClose(hCDRom2);
         }
+        else
+            cdDrvLtr.drive_count = 0;
     }
 
@@ -2973 +3001 @@
     memcpy(pTiledData, pData, *pdwDataLen);
 
+#if 1
+    /*
+     * Quick and Dirty Fix!
+     * TO BE REMOVED!
+     *
+     * On some VPC installation without CDROM we seem to
+     * use a concidrable amount of time during Win2k shutdown.
+     * No idea why, but it has to do with CDROM we think.
+     *
+     * So, let's just fail all IOCtls to CD01 if there aren't any
+     * CDROMs in the system.
+     *
+     */
+
+    /*
+     * Check for CD drives
+     * We don't have to this everytime. I mean, the os2cdrom.dmd is
+     * exactly very dynamic when it comes to this info.
+     */
+    if (cdDrvLtr.drive_count == 0xffff)
+    {
+        HFILE           hCDRom2;
+        ULONG           ulAction = 0;
+
+        if (DosOpen("\\DEV\\CD-ROM2$", &hCDRom2, &ulAction, 0,
+                    FILE_NORMAL, OPEN_ACTION_OPEN_IF_EXISTS,
+                    OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY, NULL)
+            == NO_ERROR)
+        {
+            ULONG cbData = sizeof(cdDrvLtr);
+            rc = DosDevIOCtl(hCDRom2,
+                             IOC_CDROM_2,
+                             IOCD_RETURN_DRIVE_LETTER,
+                             NULL, 0, NULL,
+                             (PVOID)&cdDrvLtr, sizeof(cdDrvLtr), &cbData);
+            DosClose(hCDRom2);
+        }
+        else
+            cdDrvLtr.drive_count = 0;
+    }
+
+    if (    cdDrvLtr.drive_count == 0
+        &&  (dwCat == IOCTL_CDROMDISK
+             || (dwCat == IOCTL_CDROMAUDIO
+                 && dwParmMaxLen >= 4 && strncmp((char*)pParm, "CD01", 4))
+             )
+       )
+    {
+        /* just return some error code */
+        return ERROR_BAD_COMMAND;
+    }
+
+#endif
 
   rc = DosDevIOCtl( (HFILE)hFile, dwCat, dwFunc,