mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-12 13:44:56 +02:00
f20e5c359d
should have prevented the Win9x dvd input from working.
- Moved the "if(Win2k)" out of the loop in _win32_dvdcss_readv.
- Put a readv() function in input_iovec.h, the input_es now compiles.
- Modified input_ts to use this function.
- Fixed an initialisation bug in vout_directx.c
- Right clicking on the mouse now displays the navigation menu.
PS: If someone is willing to test the DVD input on Win95/98/Me I will
upload an up to date binary package.
80 lines
2.7 KiB
C
80 lines
2.7 KiB
C
/*****************************************************************************
|
|
* input_iovec.h: iovec structure
|
|
*****************************************************************************
|
|
* Copyright (C) 2001 VideoLAN
|
|
*
|
|
* Authors: Samuel Hocevar <sam@zoy.org>
|
|
* Jon Lech Johansen <jon-vl@nanocrew.net>
|
|
*
|
|
* 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
|
|
* (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.
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
|
|
*****************************************************************************/
|
|
|
|
/*****************************************************************************
|
|
* iovec structure: vectored data entry
|
|
*****************************************************************************/
|
|
struct iovec
|
|
{
|
|
void *iov_base; /* Pointer to data. */
|
|
size_t iov_len; /* Length of data. */
|
|
};
|
|
|
|
/*****************************************************************************
|
|
* readv_*: readv() replacements for iovec-impaired C libraries
|
|
*****************************************************************************/
|
|
#if defined( WIN32 )
|
|
static __inline__ int readv( int i_fd, struct iovec *p_iovec, int i_count )
|
|
{
|
|
int i_index, i_len, i_total = 0;
|
|
unsigned char *p_base;
|
|
int i_bytes;
|
|
|
|
for( i_index = i_count; i_index; i_index-- )
|
|
{
|
|
|
|
i_len = p_iovec->iov_len;
|
|
p_base = p_iovec->iov_base;
|
|
|
|
/* Loop is unrolled one time to spare the (i_bytes <= 0) test */
|
|
|
|
if( i_len > 0 )
|
|
{
|
|
i_bytes = read( i_fd, p_base, i_len );
|
|
|
|
if( i_bytes < 0 )
|
|
{
|
|
/* One of the reads failed, too bad.
|
|
We won't even bother returning the reads that went ok,
|
|
and as in the posix spec the file postition is left
|
|
unspecified after a failure */
|
|
return -1;
|
|
}
|
|
|
|
i_total += i_bytes;
|
|
|
|
if( i_bytes != i_len )
|
|
{
|
|
/* we reached the end of the file or a signal interrupted
|
|
the read */
|
|
return i_total;
|
|
}
|
|
}
|
|
|
|
p_iovec++;
|
|
}
|
|
|
|
return i_total;
|
|
}
|
|
#endif /* WIN32 */
|