diff --git a/lib/MSWindows/win32.c b/lib/MSWindows/win32.c
index f4d65ba8..0d098d74 100644
--- a/lib/MSWindows/win32.c
+++ b/lib/MSWindows/win32.c
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.c,v 1.41 2004/08/10 03:03:27 rocky Exp $
+    $Id: win32.c,v 1.42 2004/08/10 03:44:55 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.41 2004/08/10 03:03:27 rocky Exp $";
+static const char _rcsid[] = "$Id: win32.c,v 1.42 2004/08/10 03:44:55 rocky Exp $";
 
 #include <cdio/cdio.h>
 #include <cdio/sector.h>
@@ -498,7 +498,7 @@ _get_cdtext_win32 (void *user_data, track_t i_track)
     return NULL;
 
   if (!p_env->gen.b_cdtext_init) 
-    init_cdtext_generic(p_env);
+    init_cdtext_generic( &(p_env->gen) );
     
   if (!p_env->gen.b_cdtext_init) return NULL;
 
diff --git a/lib/MSWindows/win32.h b/lib/MSWindows/win32.h
index 0650336c..b2aac876 100644
--- a/lib/MSWindows/win32.h
+++ b/lib/MSWindows/win32.h
@@ -1,5 +1,5 @@
 /*
-    $Id: win32.h,v 1.20 2004/08/10 03:03:27 rocky Exp $
+    $Id: win32.h,v 1.21 2004/08/10 03:44:56 rocky Exp $
 
     Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
 
@@ -43,6 +43,9 @@ typedef struct {
   access_mode_t access_mode;
 
   /* Some of the more OS specific things. */
+    /* Entry info for each track, add 1 for leadout. */
+  track_info_t  tocent[CDIO_CD_MAX_TRACKS+1];
+
   HANDLE h_device_handle; /* device descriptor */
   long  hASPI;
   short i_sid;
diff --git a/src/util.c b/src/util.c
index 2235c7a7..4f362aea 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
-  $Id: util.c,v 1.20 2004/08/10 02:29:46 rocky Exp $
+  $Id: util.c,v 1.21 2004/08/10 03:44:56 rocky Exp $
 
   Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -340,7 +340,8 @@ print_mmc_drive_features(CdIo *p_cdio)
 	case CDIO_MMC_FEATURE_DVD_CSS:
 	  printf("Ability to perform DVD CSS/CPPM authentication and"
 		 " RPC\n");
-#if 0
+#if 1
+	  printf("\tp[2] %x\n", p[2]);
 	  printf("\tMedium does%s have Content Scrambling (CSS/CPPM)\n", 
 		 (p[2] & 1) ? "": "not ");
 #endif