Changeset 7143 for trunk/src

Timestamp:

Oct 20, 2001, 11:49:01 AM (24 years ago)

Author:

achimha

Message:

fail gracefully if no ASPI there

Location:

trunk/src/wnaspi32

Files:

• initwnaspi32.cpp (modified) (2 diffs)
• winaspi32.cpp (modified) (3 diffs)

trunk/src/wnaspi32/initwnaspi32.cpp

@@ -1 @@
-/* $Id: initwnaspi32.cpp,v 1.1 2001-10-15 17:06:18 sandervl Exp $
+/* $Id: initwnaspi32.cpp,v 1.2 2001-10-20 09:49:01 achimha Exp $
  *
  * DLL entry point
@@ -53 +53 @@
        aspi = new scsiObj();
        if(aspi == NULL) {
-           dprintf(("WNASPI32: LibMain; can't allocate aspi object!"));
-           return FALSE;
+           dprintf(("WNASPI32: LibMain; can't allocate aspi object! APIs will not work!"));
+           // @@@AH 20011020 we shouldn't prevent DLL loading in this case
+           // just make sure that all API calls fail
+           return TRUE;
        }
        if(aspi->init(65535) == FALSE)

trunk/src/wnaspi32/winaspi32.cpp

@@ -1 @@
-/* $Id: winaspi32.cpp,v 1.12 2000-12-16 15:42:42 sandervl Exp $ */
+/* $Id: winaspi32.cpp,v 1.13 2001-10-20 09:49:01 achimha Exp $ */
 /*
  * WNASPI routines
@@ -328 +328 @@
   bNumDrv = 0;
 
+  // first thing we do is check whether we have a successful ASPI setup
+  if (aspi == NULL)
+  {
+      dprintf(("ASPI was not initialized successfully, return error"));
+      return (SS_FAILED_INIT << 8);
+  }
+
   if(aspi->access(FALSE)) //'non-blocking' call
   {
@@ -392 +399 @@
     LONG rc;
 
+    // first thing we do is check whether we have a successful ASPI setup
+    if (aspi == NULL)
+    {
+        dprintf(("SendASPI32Command: ASPI was not initialized successfully, return error"));
+        return SS_NO_ASPI;
+    }
+
     if(NULL==lpSRB)
       return SS_INVALID_SRB;  // Not sure what to return here but that is an error