/****************************************************************************
* cdrom.c: cdrom tools
*****************************************************************************
- * Copyright (C) 1998-2001 the VideoLAN team
+ * Copyright (C) 1998-2001 VLC authors and VideoLAN
* $Id$
*
* Authors: Johan Bilien <jobi@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
- * Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Rémi Denis-Courmont
+ * Laurent Aimar
+ * Rémi Duraffort
+ * Derk-Jan Hartman
+ * Samuel Hocevar
+ * Rafaël Carré
+ * Christophe Massiot
+ * Jean-Baptiste Kempf
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc_common.h>
-#include <vlc_access.h>
-#include <limits.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#ifdef __OS2__
+# define INCL_DOSDEVIOCTL
#endif
-#include <errno.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <limits.h>
+
+#include <vlc_common.h>
+#include <vlc_access.h>
+#include <vlc_charset.h>
+#include <vlc_fs.h>
+#include <vlc_meta.h>
#if defined( SYS_BSDI )
# include <dvd.h>
#elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H )
# include <sys/cdio.h>
# include <sys/cdrio.h>
-#elif defined( WIN32 )
+#elif defined( _WIN32 )
# include <windows.h>
# include <winioctl.h>
#elif defined (__linux__)
# include <sys/ioctl.h>
# include <linux/cdrom.h>
+#elif defined( __OS2__ )
+# include <os2safe.h>
+# include <os2.h>
+
+/*****************************************************************************
+ * vlc_DosDevIOCtl: high memory safe wrapper for DosDevIOCtl
+ *****************************************************************************
+ * Unfortunately, DosDevIOCtl() is not high memory safe API, and is not
+ * covered by os2safe.h. So define a wrapper function for it here.
+ *****************************************************************************/
+
+static APIRET vlc_DosDevIOCtl( HFILE hdevice, ULONG category, ULONG function,
+ PVOID pParams, ULONG cbParamLenMax,
+ PULONG pcbParamLen, PVOID pData,
+ ULONG cbDataLenMax, PULONG pcbDataLen )
+{
+ PVOID pParamsLow = NULL;
+ PVOID pDataLow = NULL;
+ ULONG cbParamLenLow;
+ ULONG cbDataLenLow;
+
+ APIRET rc;
+
+ rc = DosAllocMem( &pParamsLow, cbParamLenMax, fALLOC );
+ if( rc )
+ goto exit_free;
+
+ rc = DosAllocMem( &pDataLow, cbDataLenMax, fALLOC );
+ if( rc )
+ goto exit_free;
+
+ memcpy( pParamsLow, pParams, cbParamLenMax );
+ memcpy( pDataLow, pData, cbDataLenMax );
+
+ cbParamLenLow = *pcbParamLen;
+ cbDataLenLow = *pcbDataLen;
+
+ rc = DosDevIOCtl( hdevice, category, function, pParamsLow,
+ cbParamLenMax, &cbParamLenLow, pDataLow, cbDataLenMax,
+ &cbDataLenLow );
+
+ if( !rc )
+ {
+ memcpy( pParams, pParamsLow, cbParamLenMax );
+ memcpy( pData, pDataLow, cbDataLenMax );
+
+ *pcbParamLen = cbParamLenLow;
+ *pcbDataLen = cbDataLenLow;
+ }
+
+exit_free:
+ DosFreeMem( pParamsLow);
+ DosFreeMem( pDataLow);
+
+ return rc;
+}
+
+# define DosDevIOCtl vlc_DosDevIOCtl
#else
# error FIXME
#endif
#include "cdrom_internals.h"
#include "cdrom.h"
-#include <vlc_charset.h>
-#include <vlc_meta.h>
/*****************************************************************************
* ioctl_Open: Opens a VCD device or file and returns an opaque handle
int i_ret;
int b_is_file;
vcddev_t *p_vcddev;
-#ifndef WIN32
+#if !defined( _WIN32 ) && !defined( __OS2__ )
struct stat fileinfo;
#endif
/*
* Check if we are dealing with a device or a file (vcd image)
*/
-#ifdef WIN32
+#if defined( _WIN32 ) || defined( __OS2__ )
if( (strlen( psz_dev ) == 2 && psz_dev[1] == ':') )
{
b_is_file = 0;
}
#else
- if( stat( psz_dev, &fileinfo ) < 0 )
+ if( vlc_stat( psz_dev, &fileinfo ) < 0 )
{
free( p_vcddev );
return NULL;
* open the vcd device
*/
-#ifdef WIN32
+#ifdef _WIN32
i_ret = win32_vcd_open( p_this, psz_dev, p_vcddev );
+#elif defined( __OS2__ )
+ i_ret = os2_vcd_open( p_this, psz_dev, p_vcddev );
#else
p_vcddev->i_device_handle = -1;
- p_vcddev->i_device_handle = open( psz_dev, O_RDONLY | O_NONBLOCK );
+ p_vcddev->i_device_handle = vlc_open( psz_dev, O_RDONLY | O_NONBLOCK );
i_ret = (p_vcddev->i_device_handle == -1) ? -1 : 0;
#endif
}
* vcd device mode
*/
-#ifdef WIN32
+#ifdef _WIN32
if( p_vcddev->h_device_handle )
CloseHandle( p_vcddev->h_device_handle );
- if( p_vcddev->hASPI )
- FreeLibrary( (HMODULE)p_vcddev->hASPI );
+#elif defined( __OS2__ )
+ if( p_vcddev->hcd )
+ DosClose( p_vcddev->hcd );
#else
if( p_vcddev->i_device_handle != -1 )
close( p_vcddev->i_device_handle );
darwin_freeTOC( pTOC );
-#elif defined( WIN32 )
- if( p_vcddev->hASPI )
- {
- HANDLE hEvent;
- struct SRB_ExecSCSICmd ssc;
- uint8_t p_tocheader[ 4 ];
-
- /* Create the transfer completion event */
- hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
- if( hEvent == NULL )
- {
- return -1;
- }
-
- memset( &ssc, 0, sizeof( ssc ) );
-
- ssc.SRB_Cmd = SC_EXEC_SCSI_CMD;
- ssc.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY;
- ssc.SRB_HaId = LOBYTE( p_vcddev->i_sid );
- ssc.SRB_Target = HIBYTE( p_vcddev->i_sid );
- ssc.SRB_SenseLen = SENSE_LEN;
-
- ssc.SRB_PostProc = (LPVOID) hEvent;
- ssc.SRB_CDBLen = 10;
-
- /* Operation code */
- ssc.CDBByte[ 0 ] = READ_TOC;
-
- /* Format */
- ssc.CDBByte[ 2 ] = READ_TOC_FORMAT_TOC;
+#elif defined( _WIN32 )
+ DWORD dwBytesReturned;
+ CDROM_TOC cdrom_toc;
- /* Starting track */
- ssc.CDBByte[ 6 ] = 0;
-
- /* Allocation length and buffer */
- ssc.SRB_BufLen = sizeof( p_tocheader );
- ssc.SRB_BufPointer = p_tocheader;
- ssc.CDBByte[ 7 ] = ( ssc.SRB_BufLen >> 8 ) & 0xff;
- ssc.CDBByte[ 8 ] = ( ssc.SRB_BufLen ) & 0xff;
-
- /* Initiate transfer */
- ResetEvent( hEvent );
- p_vcddev->lpSendCommand( (void*) &ssc );
+ if( DeviceIoControl( p_vcddev->h_device_handle, IOCTL_CDROM_READ_TOC,
+ NULL, 0, &cdrom_toc, sizeof(CDROM_TOC),
+ &dwBytesReturned, NULL ) == 0 )
+ {
+ msg_Err( p_this, "could not read TOCHDR" );
+ return 0;
+ }
- /* If the command has still not been processed, wait until it's
- * finished */
- if( ssc.SRB_Status == SS_PENDING )
- WaitForSingleObject( hEvent, INFINITE );
+ i_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1;
- /* check that the transfer went as planned */
- if( ssc.SRB_Status != SS_COMP )
- {
- CloseHandle( hEvent );
+ if( pp_sectors )
+ {
+ *pp_sectors = calloc( i_tracks + 1, sizeof(**pp_sectors) );
+ if( *pp_sectors == NULL )
return 0;
- }
- i_tracks = p_tocheader[3] - p_tocheader[2] + 1;
-
- if( pp_sectors )
+ for( int i = 0 ; i <= i_tracks ; i++ )
{
- int i, i_toclength;
- uint8_t *p_fulltoc;
-
- i_toclength = 4 /* header */ + p_tocheader[0] +
- ((unsigned int)p_tocheader[1] << 8);
-
- p_fulltoc = malloc( i_toclength );
- *pp_sectors = calloc( i_tracks + 1, sizeof(**pp_sectors) );
-
- if( *pp_sectors == NULL || p_fulltoc == NULL )
- {
- free( *pp_sectors );
- free( p_fulltoc );
- CloseHandle( hEvent );
- return 0;
- }
-
- /* Allocation length and buffer */
- ssc.SRB_BufLen = i_toclength;
- ssc.SRB_BufPointer = p_fulltoc;
- ssc.CDBByte[ 7 ] = ( ssc.SRB_BufLen >> 8 ) & 0xff;
- ssc.CDBByte[ 8 ] = ( ssc.SRB_BufLen ) & 0xff;
-
- /* Initiate transfer */
- ResetEvent( hEvent );
- p_vcddev->lpSendCommand( (void*) &ssc );
-
- /* If the command has still not been processed, wait until it's
- * finished */
- if( ssc.SRB_Status == SS_PENDING )
- WaitForSingleObject( hEvent, INFINITE );
+ (*pp_sectors)[ i ] = MSF_TO_LBA2(
+ cdrom_toc.TrackData[i].Address[1],
+ cdrom_toc.TrackData[i].Address[2],
+ cdrom_toc.TrackData[i].Address[3] );
+ msg_Dbg( p_this, "p_sectors: %i, %i", i, (*pp_sectors)[i]);
+ }
+ }
- /* check that the transfer went as planned */
- if( ssc.SRB_Status != SS_COMP )
- i_tracks = 0;
+#elif defined( __OS2__ )
+ cdrom_get_tochdr_t get_tochdr = {{'C', 'D', '0', '1'}};
+ cdrom_tochdr_t tochdr;
- for( i = 0 ; i <= i_tracks ; i++ )
- {
- int i_index = 8 + 8 * i;
- (*pp_sectors)[ i ] = ((int)p_fulltoc[ i_index ] << 24) +
- ((int)p_fulltoc[ i_index+1 ] << 16) +
- ((int)p_fulltoc[ i_index+2 ] << 8) +
- (int)p_fulltoc[ i_index+3 ];
+ ULONG param_len;
+ ULONG data_len;
+ ULONG rc;
- msg_Dbg( p_this, "p_sectors: %i, %i", i, (*pp_sectors)[i]);
- }
-
- free( p_fulltoc );
- }
+ rc = DosDevIOCtl( p_vcddev->hcd, IOCTL_CDROMAUDIO,
+ CDROMAUDIO_GETAUDIODISK,
+ &get_tochdr, sizeof( get_tochdr ), ¶m_len,
+ &tochdr, sizeof( tochdr ), &data_len );
+ if( rc )
+ {
+ msg_Err( p_this, "could not read TOCHDR" );
+ return 0;
+ }
- CloseHandle( hEvent );
+ i_tracks = tochdr.last_track - tochdr.first_track + 1;
- }
- else
+ if( pp_sectors )
{
- DWORD dwBytesReturned;
- CDROM_TOC cdrom_toc;
+ cdrom_get_track_t get_track = {{'C', 'D', '0', '1'}, };
+ cdrom_track_t track;
+ int i;
- if( DeviceIoControl( p_vcddev->h_device_handle,
- IOCTL_CDROM_READ_TOC,
- NULL, 0, &cdrom_toc, sizeof(CDROM_TOC),
- &dwBytesReturned, NULL ) == 0 )
- {
- msg_Err( p_this, "could not read TOCHDR" );
+ *pp_sectors = calloc( i_tracks + 1, sizeof(**pp_sectors) );
+ if( *pp_sectors == NULL )
return 0;
- }
-
- i_tracks = cdrom_toc.LastTrack - cdrom_toc.FirstTrack + 1;
- if( pp_sectors )
+ for( i = 0 ; i < i_tracks ; i++ )
{
- int i;
-
- *pp_sectors = calloc( i_tracks + 1, sizeof(**pp_sectors) );
- if( *pp_sectors == NULL )
- return 0;
-
- for( i = 0 ; i <= i_tracks ; i++ )
+ get_track.track = tochdr.first_track + i;
+ rc = DosDevIOCtl( p_vcddev->hcd, IOCTL_CDROMAUDIO,
+ CDROMAUDIO_GETAUDIOTRACK,
+ &get_track, sizeof(get_track), ¶m_len,
+ &track, sizeof(track), &data_len );
+ if (rc)
{
- (*pp_sectors)[ i ] = MSF_TO_LBA2(
- cdrom_toc.TrackData[i].Address[1],
- cdrom_toc.TrackData[i].Address[2],
- cdrom_toc.TrackData[i].Address[3] );
- msg_Dbg( p_this, "p_sectors: %i, %i", i, (*pp_sectors)[i]);
+ msg_Err( p_this, "could not read %d track",
+ get_track.track );
+ return 0;
}
+
+ (*pp_sectors)[ i ] = MSF_TO_LBA2(
+ track.start.minute,
+ track.start.second,
+ track.start.frame );
+ msg_Dbg( p_this, "p_sectors: %i, %i", i, (*pp_sectors)[i]);
}
+
+ /* for lead-out track */
+ (*pp_sectors)[ i ] = MSF_TO_LBA2(
+ tochdr.lead_out.minute,
+ tochdr.lead_out.second,
+ tochdr.lead_out.frame );
+ msg_Dbg( p_this, "p_sectors: %i, %i", i, (*pp_sectors)[i]);
}
#elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H ) \
SEEK_SET ) == -1 )
{
msg_Err( p_this, "Could not lseek to sector %d", i_sector );
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ goto error;
}
if( read( p_vcddev->i_vcdimage_handle, p_block, VCD_SECTOR_SIZE * i_nb)
== -1 )
{
msg_Err( p_this, "Could not read sector %d", i_sector );
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ goto error;
}
}
if( ioctl( p_vcddev->i_device_handle, DKIOCCDREAD, &cd_read ) == -1 )
{
msg_Err( p_this, "could not read block %d", i_sector );
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ goto error;
}
-#elif defined( WIN32 )
- if( p_vcddev->hASPI )
- {
- HANDLE hEvent;
- struct SRB_ExecSCSICmd ssc;
+#elif defined( _WIN32 )
+ DWORD dwBytesReturned;
+ RAW_READ_INFO cdrom_raw;
+
+ /* Initialize CDROM_RAW_READ structure */
+ cdrom_raw.DiskOffset.QuadPart = CD_SECTOR_SIZE * i_sector;
+ cdrom_raw.SectorCount = i_nb;
+ cdrom_raw.TrackMode = i_type == VCD_TYPE ? XAForm2 : CDDA;
- /* Create the transfer completion event */
- hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
- if( hEvent == NULL )
+ if( DeviceIoControl( p_vcddev->h_device_handle, IOCTL_CDROM_RAW_READ,
+ &cdrom_raw, sizeof(RAW_READ_INFO), p_block,
+ VCD_SECTOR_SIZE * i_nb, &dwBytesReturned,
+ NULL ) == 0 )
+ {
+ if( i_type == VCD_TYPE )
{
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ /* Retry in YellowMode2 */
+ cdrom_raw.TrackMode = YellowMode2;
+ if( DeviceIoControl( p_vcddev->h_device_handle,
+ IOCTL_CDROM_RAW_READ, &cdrom_raw,
+ sizeof(RAW_READ_INFO), p_block,
+ VCD_SECTOR_SIZE * i_nb, &dwBytesReturned,
+ NULL ) == 0 )
+ goto error;
}
+ else return -1;
+ }
- memset( &ssc, 0, sizeof( ssc ) );
-
- ssc.SRB_Cmd = SC_EXEC_SCSI_CMD;
- ssc.SRB_Flags = SRB_DIR_IN | SRB_EVENT_NOTIFY;
- ssc.SRB_HaId = LOBYTE( p_vcddev->i_sid );
- ssc.SRB_Target = HIBYTE( p_vcddev->i_sid );
- ssc.SRB_SenseLen = SENSE_LEN;
-
- ssc.SRB_PostProc = (LPVOID) hEvent;
- ssc.SRB_CDBLen = 12;
-
- /* Operation code */
- ssc.CDBByte[ 0 ] = READ_CD;
-
- /* Sector type */
- ssc.CDBByte[ 1 ] = i_type == VCD_TYPE ? SECTOR_TYPE_MODE2_FORM2 :
- SECTOR_TYPE_CDDA;
-
- /* Start of LBA */
- ssc.CDBByte[ 2 ] = ( i_sector >> 24 ) & 0xff;
- ssc.CDBByte[ 3 ] = ( i_sector >> 16 ) & 0xff;
- ssc.CDBByte[ 4 ] = ( i_sector >> 8 ) & 0xff;
- ssc.CDBByte[ 5 ] = ( i_sector ) & 0xff;
-
- /* Transfer length */
- ssc.CDBByte[ 6 ] = ( i_nb >> 16 ) & 0xff;
- ssc.CDBByte[ 7 ] = ( i_nb >> 8 ) & 0xff;
- ssc.CDBByte[ 8 ] = ( i_nb ) & 0xff;
-
- /* Data selection */
- ssc.CDBByte[ 9 ] = i_type == VCD_TYPE ? READ_CD_RAW_MODE2 :
- READ_CD_USERDATA;
-
- /* Result buffer */
- ssc.SRB_BufPointer = p_block;
- ssc.SRB_BufLen = VCD_SECTOR_SIZE * i_nb;
+#elif defined( __OS2__ )
+ cdrom_readlong_t readlong = {{'C', 'D', '0', '1'}, };
- /* Initiate transfer */
- ResetEvent( hEvent );
- p_vcddev->lpSendCommand( (void*) &ssc );
+ ULONG param_len;
+ ULONG data_len;
+ ULONG rc;
- /* If the command has still not been processed, wait until it's
- * finished */
- if( ssc.SRB_Status == SS_PENDING )
- {
- WaitForSingleObject( hEvent, INFINITE );
- }
- CloseHandle( hEvent );
+ readlong.addr_mode = 0; /* LBA mode */
+ readlong.sectors = i_nb;
+ readlong.start = i_sector;
- /* check that the transfer went as planned */
- if( ssc.SRB_Status != SS_COMP )
- {
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
- }
- }
- else
+ rc = DosDevIOCtl( p_vcddev->hcd, IOCTL_CDROMDISK, CDROMDISK_READLONG,
+ &readlong, sizeof( readlong ), ¶m_len,
+ p_block, VCD_SECTOR_SIZE * i_nb, &data_len );
+ if( rc )
{
- DWORD dwBytesReturned;
- RAW_READ_INFO cdrom_raw;
-
- /* Initialize CDROM_RAW_READ structure */
- cdrom_raw.DiskOffset.QuadPart = CD_SECTOR_SIZE * i_sector;
- cdrom_raw.SectorCount = i_nb;
- cdrom_raw.TrackMode = i_type == VCD_TYPE ? XAForm2 : CDDA;
-
- if( DeviceIoControl( p_vcddev->h_device_handle,
- IOCTL_CDROM_RAW_READ, &cdrom_raw,
- sizeof(RAW_READ_INFO), p_block,
- VCD_SECTOR_SIZE * i_nb, &dwBytesReturned,
- NULL ) == 0 )
- {
- if( i_type == VCD_TYPE )
- {
- /* Retry in YellowMode2 */
- cdrom_raw.TrackMode = YellowMode2;
- if( DeviceIoControl( p_vcddev->h_device_handle,
- IOCTL_CDROM_RAW_READ, &cdrom_raw,
- sizeof(RAW_READ_INFO), p_block,
- VCD_SECTOR_SIZE * i_nb, &dwBytesReturned,
- NULL ) == 0 )
- {
- free( p_block );
- return -1;
- }
- }
- else return -1;
- }
+ msg_Err( p_this, "could not read block %d", i_sector );
+ goto error;
}
#elif defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
if( i_ret == -1 )
{
msg_Err( p_this, "SCIOCCOMMAND failed" );
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ goto error;
}
if( sc.retsts || sc.error )
{
msg_Err( p_this, "SCSI command failed: status %d error %d",
sc.retsts, sc.error );
- if( i_type == VCD_TYPE ) free( p_block );
- return -1;
+ goto error;
}
#elif defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H )
== -1 )
{
msg_Err( p_this, "Could not set block size" );
- if( i_type == VCD_TYPE ) free( p_block );
- return( -1 );
+ goto error;
}
if( lseek( p_vcddev->i_device_handle,
i_sector * VCD_SECTOR_SIZE, SEEK_SET ) == -1 )
{
msg_Err( p_this, "Could not lseek to sector %d", i_sector );
- if( i_type == VCD_TYPE ) free( p_block );
- return( -1 );
+ goto error;
}
if( read( p_vcddev->i_device_handle,
p_block, VCD_SECTOR_SIZE * i_nb ) == -1 )
{
msg_Err( p_this, "Could not read sector %d", i_sector );
- if( i_type == VCD_TYPE ) free( p_block );
- return( -1 );
+ goto error;
}
#else
i_sector );
if( i == 0 )
- {
- if( i_type == VCD_TYPE ) free( p_block );
- return( -1 );
- }
- else break;
+ goto error;
+ else
+ break;
}
}
#endif
}
return( 0 );
+
+error:
+ if( i_type == VCD_TYPE )
+ free( p_block );
+ return( -1 );
}
/****************************************************************************
{
/* psz_dev must be the cue file. Let's assume there's a .bin
* file with the same filename */
- psz_vcdfile = malloc( p_pos - psz_dev + 5 /* ".bin" */ );
- strncpy( psz_vcdfile, psz_dev, p_pos - psz_dev );
- strcpy( psz_vcdfile + (p_pos - psz_dev), ".bin");
+ if( asprintf( &psz_vcdfile, "%.*s.bin", (int)(p_pos - psz_dev),
+ psz_dev ) < 0 )
+ psz_vcdfile = NULL;
psz_cuefile = strdup( psz_dev );
}
else
+ if( p_pos )
{
/* psz_dev must be the actual vcd file. Let's assume there's a .cue
* file with the same filename */
- if( p_pos )
- {
- psz_cuefile = malloc( p_pos - psz_dev + 5 /* ".cue" */ );
- strncpy( psz_cuefile, psz_dev, p_pos - psz_dev );
- strcpy( psz_cuefile + (p_pos - psz_dev), ".cue");
- }
- else
- {
- if( asprintf( &psz_cuefile, "%s.cue", psz_dev ) == -1 )
- psz_cuefile = NULL;
- }
- /* If we need to look up the .cue file, then we don't have to look for the vcd */
+ if( asprintf( &psz_cuefile, "%.*s.cue", (int)(p_pos - psz_dev),
+ psz_dev ) < 0 )
+ psz_cuefile = NULL;
psz_vcdfile = strdup( psz_dev );
}
+ else
+ {
+ if( asprintf( &psz_cuefile, "%s.cue", psz_dev ) == -1 )
+ psz_cuefile = NULL;
+ /* If we need to look up the .cue file, then we don't have to look
+ * for the vcd */
+ psz_vcdfile = strdup( psz_dev );
+ }
+
+ if( psz_cuefile == NULL || psz_vcdfile == NULL )
+ goto error;
/* Open the cue file and try to parse it */
msg_Dbg( p_this,"trying .cue file: %s", psz_cuefile );
- cuefile = utf8_fopen( psz_cuefile, "rt" );
+ cuefile = vlc_fopen( psz_cuefile, "rt" );
if( cuefile == NULL )
{
msg_Dbg( p_this, "could not find .cue file" );
}
msg_Dbg( p_this,"guessing vcd image file: %s", psz_vcdfile );
- p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
- O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
-
+ p_vcddev->i_vcdimage_handle = vlc_open( psz_vcdfile,
+ O_RDONLY | O_NONBLOCK | O_BINARY );
+
while( fgets( line, 1024, cuefile ) && !b_found )
{
/* We have a cue file, but no valid vcd file yet */
char filename[1024];
char type[16];
int i_temp = sscanf( line, "FILE \"%1023[^\"]\" %15s", filename, type );
- *p_pos = 0;
switch( i_temp )
{
case 2:
strcpy( psz_vcdfile + (p_pos - psz_cuefile + 1), filename );
} else psz_vcdfile = strdup( filename );
msg_Dbg( p_this,"using vcd image file: %s", psz_vcdfile );
- p_vcddev->i_vcdimage_handle = utf8_open( psz_vcdfile,
- O_RDONLY | O_NONBLOCK | O_BINARY, 0666 );
+ p_vcddev->i_vcdimage_handle = vlc_open( psz_vcdfile,
+ O_RDONLY | O_NONBLOCK | O_BINARY );
}
b_found = true;
default:
while( fgets( line, 1024, cuefile ) && i_tracks < INT_MAX-1 )
{
/* look for a TRACK line */
- char psz_dummy[9];
+ char psz_dummy[10];
if( !sscanf( line, "%9s", psz_dummy ) || strcmp(psz_dummy, "TRACK") )
continue;
IOObjectRelease( iterator );
}
- if( service == NULL )
+ if( !service )
{
msg_Err( p_this, "search for kIOCDMediaClass came up empty" );
return( NULL );
}
#endif /* __APPLE__ */
-#if defined( WIN32 )
+#if defined( _WIN32 )
/*****************************************************************************
* win32_vcd_open: open vcd drive
*****************************************************************************
- * Load and use aspi if it is available, otherwise use IOCTLs on WinNT/2K/XP.
+ * Use IOCTLs on WinNT/2K/XP.
*****************************************************************************/
static int win32_vcd_open( vlc_object_t * p_this, const char *psz_dev,
vcddev_t *p_vcddev )
{
/* Initializations */
p_vcddev->h_device_handle = NULL;
- p_vcddev->i_sid = 0;
- p_vcddev->hASPI = 0;
- p_vcddev->lpSendCommand = 0;
- if( WIN_NT )
- {
- char psz_win32_drive[7];
+ char psz_win32_drive[7];
- msg_Dbg( p_this, "using winNT/2K/XP ioctl layer" );
+ msg_Dbg( p_this, "using winNT/2K/XP ioctl layer" );
- sprintf( psz_win32_drive, "\\\\.\\%c:", psz_dev[0] );
+ sprintf( psz_win32_drive, "\\\\.\\%c:", psz_dev[0] );
- p_vcddev->h_device_handle = CreateFile( psz_win32_drive, GENERIC_READ,
+ p_vcddev->h_device_handle = CreateFileA( psz_win32_drive, GENERIC_READ,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_EXISTING,
FILE_FLAG_NO_BUFFERING |
FILE_FLAG_RANDOM_ACCESS, NULL );
- return (p_vcddev->h_device_handle == NULL) ? -1 : 0;
- }
- else
- {
- HMODULE hASPI = NULL;
- long (*lpGetSupport)( void ) = NULL;
- long (*lpSendCommand)( void* ) = NULL;
- DWORD dwSupportInfo;
- int i, j, i_hostadapters;
- char c_drive = psz_dev[0];
-
- hASPI = LoadLibrary( "wnaspi32.dll" );
- if( hASPI != NULL )
- {
- lpGetSupport = (void *)GetProcAddress( hASPI, "GetASPI32SupportInfo" );
- lpSendCommand = (void *)GetProcAddress( hASPI, "SendASPI32Command" );
- }
-
- if( hASPI == NULL || lpGetSupport == NULL || lpSendCommand == NULL )
- {
- msg_Dbg( p_this,
- "unable to load aspi or get aspi function pointers" );
- if( hASPI ) FreeLibrary( hASPI );
- return -1;
- }
-
- /* ASPI support seems to be there */
-
- dwSupportInfo = lpGetSupport();
-
- if( HIBYTE( LOWORD ( dwSupportInfo ) ) == SS_NO_ADAPTERS )
- {
- msg_Dbg( p_this, "no host adapters found (aspi)" );
- FreeLibrary( hASPI );
- return -1;
- }
-
- if( HIBYTE( LOWORD ( dwSupportInfo ) ) != SS_COMP )
- {
- msg_Dbg( p_this, "unable to initalize aspi layer" );
- FreeLibrary( hASPI );
- return -1;
- }
-
- i_hostadapters = LOBYTE( LOWORD( dwSupportInfo ) );
- if( i_hostadapters == 0 )
- {
- FreeLibrary( hASPI );
- return -1;
- }
-
- c_drive = c_drive > 'Z' ? c_drive - 'a' : c_drive - 'A';
+ return (p_vcddev->h_device_handle == NULL) ? -1 : 0;
+}
- for( i = 0; i < i_hostadapters; i++ )
- {
- for( j = 0; j < 15; j++ )
- {
- struct SRB_GetDiskInfo srbDiskInfo;
-
- srbDiskInfo.SRB_Cmd = SC_GET_DISK_INFO;
- srbDiskInfo.SRB_HaId = i;
- srbDiskInfo.SRB_Flags = 0;
- srbDiskInfo.SRB_Hdr_Rsvd = 0;
- srbDiskInfo.SRB_Target = j;
- srbDiskInfo.SRB_Lun = 0;
-
- lpSendCommand( (void*) &srbDiskInfo );
-
- if( (srbDiskInfo.SRB_Status == SS_COMP) &&
- (srbDiskInfo.SRB_Int13HDriveInfo == c_drive) )
- {
- /* Make sure this is a cdrom device */
- struct SRB_GDEVBlock srbGDEVBlock;
-
- memset( &srbGDEVBlock, 0, sizeof(struct SRB_GDEVBlock) );
- srbGDEVBlock.SRB_Cmd = SC_GET_DEV_TYPE;
- srbGDEVBlock.SRB_HaId = i;
- srbGDEVBlock.SRB_Target = j;
-
- lpSendCommand( (void*) &srbGDEVBlock );
-
- if( ( srbGDEVBlock.SRB_Status == SS_COMP ) &&
- ( srbGDEVBlock.SRB_DeviceType == DTYPE_CDROM ) )
- {
- p_vcddev->i_sid = MAKEWORD( i, j );
- p_vcddev->hASPI = (long)hASPI;
- p_vcddev->lpSendCommand = lpSendCommand;
- msg_Dbg( p_this, "using aspi layer" );
-
- return 0;
- }
- else
- {
- FreeLibrary( hASPI );
- msg_Dbg( p_this, "%c: is not a cdrom drive",
- psz_dev[0] );
- return -1;
- }
- }
- }
- }
+#endif /* _WIN32 */
- FreeLibrary( hASPI );
- msg_Dbg( p_this, "unable to get haid and target (aspi)" );
+#ifdef __OS2__
+/*****************************************************************************
+ * os2_vcd_open: open vcd drive
+ *****************************************************************************/
+static int os2_vcd_open( vlc_object_t * p_this, const char *psz_dev,
+ vcddev_t *p_vcddev )
+{
+ char device[] = "X:";
+ HFILE hcd;
+ ULONG i_action;
+ ULONG rc;
+
+ p_vcddev->hcd = 0;
+
+ device[0] = psz_dev[0];
+ rc = DosOpen( device, &hcd, &i_action, 0, FILE_NORMAL,
+ OPEN_ACTION_OPEN_IF_EXISTS | OPEN_ACTION_FAIL_IF_NEW,
+ OPEN_ACCESS_READONLY | OPEN_SHARE_DENYNONE | OPEN_FLAGS_DASD,
+ NULL);
+ if( rc )
+ {
+ msg_Err( p_this, "could not open the device %s", psz_dev );
+ return -1;
}
- return -1;
+ p_vcddev->hcd = hcd;
+ return 0;
}
-#endif /* WIN32 */
+#endif
/* */
static void astrcat( char **ppsz_dst, char *psz_src )
}
#if defined( __APPLE__ ) || \
+ defined( __OS2__ ) || \
defined( HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H ) || \
defined( HAVE_SCSIREQ_IN_SYS_SCSIIO_H )
static int CdTextRead( vlc_object_t *p_object, const vcddev_t *p_vcddev,
uint8_t **pp_buffer, int *pi_buffer )
{
VLC_UNUSED( p_object );
+ VLC_UNUSED( p_vcddev );
+ VLC_UNUSED( pp_buffer );
+ VLC_UNUSED( pi_buffer );
return -1;
}
-#elif defined( WIN32 )
+#elif defined( _WIN32 )
static int CdTextRead( vlc_object_t *p_object, const vcddev_t *p_vcddev,
uint8_t **pp_buffer, int *pi_buffer )
{
- if( p_vcddev->hASPI )
- {
- msg_Err( p_object, "mode ASPI unsupported for CD-TEXT" );
- return -1;
- }
+ VLC_UNUSED( p_object );
CDROM_READ_TOC_EX TOCEx;
memset(&TOCEx, 0, sizeof(TOCEx));
projects / vlc / blobdiff