From db5ed09ce8c5d9e13a22b5c6262cb10539e1225f Mon Sep 17 00:00:00 2001
From: rocky <rocky>
Date: Fri, 6 Aug 2004 14:27:33 +0000
Subject: [PATCH] win32.c: initialize capabilities before setting them. util.c:
 typo was using read parameter for determining CD-RW writing.

---
 lib/MSWindows/win32.c | 8 ++++++--
 src/util.c            | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/MSWindows/win32.c b/lib/MSWindows/win32.c
index d5aa6417..4b8b3211 100644
--- a/lib/MSWindows/win32.c
+++ b/lib/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.c,v 1.37 2004/08/03 12:45:40 rocky Exp $
+    $Id: win32.c,v 1.38 2004/08/06 14:27:33 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: win32.c,v 1.37 2004/08/03 12:45:40 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.38 2004/08/06 14:27:33 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -127,6 +127,10 @@ _cdio_get_drive_cap (const void *env,
 {
   const _img_private_t *_obj = env;
 
+  *p_read_cap  = 0;
+  *p_write_cap = 0;
+  *p_misc_cap  = 0;
+
   if (_obj->hASPI) {
     /* A safe guess */ 
 
diff --git a/src/util.c b/src/util.c
index 0da47778..83acf3d6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
-  $Id: util.c,v 1.12 2004/08/06 00:53:59 rocky Exp $
+  $Id: util.c,v 1.13 2004/08/06 14:27:33 rocky Exp $
 
   Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -137,7 +137,7 @@ void print_drive_capabilities(cdio_drive_read_cap_t  i_read_cap,
   } else {
     printf("\nWriting....\n");
     printf(_("  Can write CD-RW           : %s\n"), 
-	   i_read_cap & CDIO_DRIVE_CAP_WRITE_CD_RW     ? "Yes" : "No");
+	   i_write_cap & CDIO_DRIVE_CAP_WRITE_CD_RW     ? "Yes" : "No");
     printf(_("  Can write DVD-R           : %s\n"), 
 	   i_write_cap & CDIO_DRIVE_CAP_WRITE_DVD_R    ? "Yes" : "No");
     printf(_("  Can write DVD-RAM         : %s\n"),