From 9edd3db3d21cf32bf1d96ed9179d5fb6f7ecbad8 Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Sat, 23 Jan 2010 21:59:43 -0500
Subject: [PATCH] Better diagnostic messages for MS Window driver.

---
 lib/driver/MSWindows/aspi32.c | 10 ++++++----
 lib/driver/MSWindows/win32.c  |  7 +++----
 src/cd-paranoia/.gitignore    |  1 +
 test/driver/.gitignore        |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/driver/MSWindows/aspi32.c b/lib/driver/MSWindows/aspi32.c
index 8ef84cb8..d0b28e06 100644
--- a/lib/driver/MSWindows/aspi32.c
+++ b/lib/driver/MSWindows/aspi32.c
@@ -448,13 +448,14 @@ init_aspi (_img_private_t *env)
                   env->lpSendCommand = lpSendCommand;
                   env->b_aspi_init   = true;
                   env->i_lun         = i_lun;
-                  cdio_debug("Using ASPI layer");
+                  cdio_debug("Using ASPI layer for %s",
+			     env->gen.source_name);
                   
                   return true;
                 } else {
                   FreeLibrary( hASPI );
-                  cdio_debug( "%c: is not a CD-ROM drive",
-                              env->gen.source_name[0] );
+                  cdio_debug( "%s: is not a CD-ROM drive",
+                              env->gen.source_name );
                   return false;
                 }
               }
@@ -464,7 +465,8 @@ init_aspi (_img_private_t *env)
   }
   
   FreeLibrary( hASPI );
-  cdio_debug( "Unable to get HaId and target (ASPI)" );
+  cdio_info( "Unable to find host adapter id and target (ASPI) for %s",
+	     env->gen.source_name );
   return false;
 }
 
diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c
index 79b39e4f..e2345e88 100644
--- a/lib/driver/MSWindows/win32.c
+++ b/lib/driver/MSWindows/win32.c
@@ -1004,10 +1004,9 @@ cdio_open_am_win32 (const char *psz_orig_source, const char *psz_access_mode)
     if (cdio_is_device_win32(psz_orig_source))
       set_arg_win32(_data, "source", psz_orig_source);
     else {
-      /* The below would be okay if all device drivers worked this way. */
-#if 0
-      cdio_info ("source %s is a not a device", psz_orig_source);
-#endif
+      /* The below would be okay as an info message if all device
+	 drivers worked this way. */
+      cdio_debug ("source %s is a not a device", psz_orig_source);
       free(_data);
       return NULL;
     }
diff --git a/src/cd-paranoia/.gitignore b/src/cd-paranoia/.gitignore
index 2856f63a..ac9e6260 100644
--- a/src/cd-paranoia/.gitignore
+++ b/src/cd-paranoia/.gitignore
@@ -1,3 +1,4 @@
+/*.exe
 /*.o
 /.deps
 /.libs
diff --git a/test/driver/.gitignore b/test/driver/.gitignore
index a6dae564..2cf1a8ee 100644
--- a/test/driver/.gitignore
+++ b/test/driver/.gitignore
@@ -1,10 +1,12 @@
 /*.o
+/*.exe
 /*~
 /.deps
 /.libs
 /Makefile
 /Makefile.in
 /bincue
+/bincue.c
 /follow_symlink
 /freebsd
 /bincue