7 files changed, 102 insertions, 10 deletions

diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index 8b5cfbb08..3365a9ce1 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -29,7 +29,7 @@
  * - it's possible speeder saving streams in the xine without playing:
  *     xine stream_mrl#save:file.raw\;noaudio\;novideo
  *
- * $Id: input_rip.c,v 1.9 2003/10/24 09:34:01 mroi Exp $
+ * $Id: input_rip.c,v 1.10 2003/11/02 14:12:52 valtri Exp $
  */
 
 /* TODO:
@@ -577,6 +577,7 @@ input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *file
     free(this);
     return NULL;
   }
+#ifndef _MSC_VER
   if (errno != ENOENT && S_ISFIFO(pstat.st_mode)) {
     this->regular = 0;
     mode = "wb";
@@ -584,6 +585,11 @@ input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *file
     this->regular = 1;
     mode = "wb+";
   }
+#else
+  /* no fifos under MSVC */
+  this->regular = 1;
+  mode = "wb+";
+#endif
   
   if ((this->file = fopen(target, mode)) == NULL) {
     xine_log(this->stream->xine, XINE_LOG_MSG, 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index f4b6fff94..2a263c297 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: load_plugins.c,v 1.159 2003/10/31 22:08:37 valtri Exp $
+ * $Id: load_plugins.c,v 1.160 2003/11/02 14:12:52 valtri Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -490,7 +490,7 @@ static void _load_required_plugins(xine_t *this, xine_list_t *list) {
       if( !node->plugin_class ) {
 
         xine_list_delete_current (list);
-        node = list->cur->content;
+        node = list->cur ? list->cur->content : NULL;
 
       } else
 	node = xine_list_next_content (list);
diff --git a/win32/config.h b/win32/config.h
index f5cb020c3..0ad72c880 100755
--- a/win32/config.h
+++ b/win32/config.h
@@ -420,7 +420,7 @@ static char * exec_path_append_subdir( char * string )
 
 		// terminate at first space
 		tmpchar = strchr( tmp_win32_path, ' ' );
-		*tmpchar = 0;
+		if (tmpchar) *tmpchar = 0;
 	}
 
 	// find the last occurance of a back 
diff --git a/win32/libxine.def b/win32/libxine.def
index 8c8f0d078..48e6dea63 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -6,14 +6,19 @@ EXPORTS
 xine_init
 xine_exit
 xine_play
-xine_set_speed
-xine_get_speed
 xine_stop
 xine_eject
 
 xine_open
+xine_close
 xine_new
+xine_dispose
 xine_stream_new
+xine_stream_master_slave
+
+xine_trick_mode
+xine_engine_set_param
+xine_engine_get_param
 
 xine_get_status
 xine_get_audio_channel
@@ -27,19 +32,25 @@ xine_get_browsable_input_plugin_ids
 xine_get_browse_mrls
 xine_get_autoplay_input_plugin_ids
 xine_get_autoplay_mrls
+xine_get_file_extensions
+xine_get_mime_types
+xine_get_demux_for_mime_type
+xine_get_input_plugin_description
 xine_list_video_output_plugins
 xine_list_audio_output_plugins
 xine_get_current_frame
-xine_get_osd_renderer
 
 xine_get_meta_info
 
 xine_open_video_driver
 xine_open_audio_driver
+xine_close_audio_driver
+xine_close_video_driver
 
 xine_log
 xine_get_log
 xine_get_error
+xine_port_send_gui_data
 
 xine_get_version_string
 xine_get_version
@@ -47,27 +58,80 @@ xine_check_version
 xine_set_param
 xine_get_param
 
+xine_get_current_frame
+xine_get_current_vpts
 xine_get_current_info
 xine_get_stream_info
 xine_get_pos_length
 
 xine_set_speed
-xine_get_speed
 
-xine_tvmode_init
+xine_post_init
+xine_list_post_plugins
+xine_list_post_plugins_typed
+xine_post_list_inputs
+xine_post_list_outputs
+xine_post_input
+xine_post_output
+xine_post_wire
+xine_post_wire_video_port
+xine_post_wire_audio_port
+xine_get_video_source
+xine_get_audio_source
+xine_post_dispose
+
+xine_get_log_section_count
+xine_get_log_names
+xine_register_log_cb
+
 xine_event_create_listener_thread
 xine_event_new_queue
 xine_event_send
 xine_event_free
 xine_event_get
+xine_event_wait
 xine_event_dispose_queue
 
+xine_osd_new
+xine_osd_draw_point
+xine_osd_draw_line
+xine_osd_draw_rect
+xine_osd_draw_text
+xine_osd_draw_bitmap
+xine_osd_get_text_size
+xine_osd_set_font
+xine_osd_set_encoding
+xine_osd_set_position
+xine_osd_show
+xine_osd_hide
+xine_osd_clear
+xine_osd_set_text_palette
+xine_osd_get_palette
+xine_osd_set_palette
+xine_osd_free
+
+xine_tvmode_init
+xine_tvmode_use
+xine_tvmode_set_tvsystem
+xine_tvmode_switch
+xine_tvmode_size
+xine_tvmode_exit
+
 xine_message
 
+xine_config_register_string
+xine_config_register_range
+xine_config_register_enum
+xine_config_register_num
+xine_config_register_bool
+xine_config_get_first_entry
+xine_config_get_next_entry
 xine_config_lookup_entry
+xine_config_update_entry
 xine_config_load
+xine_config_save
+xine_config_reset
 xine_config_update_entry
-xine_config_register_enum
 
 xine_demux_control_newpts
 xine_demux_control_start
@@ -88,3 +152,13 @@ vo_scale_compute_output_size
 vo_scale_compute_ideal_size
 vo_scale_aspect_ratio_name
 
+xine_set_stream_info
+xine_set_meta_info
+xine_set_metan_info
+
+xio_select
+xio_tcp_connect
+xio_tcp_read
+xio_tcp_write
+xio_file_read
+xio_file_write
diff --git a/win32/libxine.dsp b/win32/libxine.dsp
index 2e278c673..9a14b760a 100644
--- a/win32/libxine.dsp
+++ b/win32/libxine.dsp
@@ -141,6 +141,10 @@ SOURCE="..\src\xine-engine\info_helper.c"
 # End Source File

 # Begin Source File

 

+SOURCE="..\src\xine-engine\io_helper.c"

+# End Source File

+# Begin Source File

+

 SOURCE="..\src\xine-engine\input_rip.c"

 # End Source File

 # Begin Source File

diff --git a/win32/xineplug_decode_a52.dsp b/win32/xineplug_decode_a52.dsp
index 6ad238cc1..151940e39 100644
--- a/win32/xineplug_decode_a52.dsp
+++ b/win32/xineplug_decode_a52.dsp
@@ -98,6 +98,10 @@ SOURCE=..\src\liba52\bit_allocate.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\liba52\crc.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\liba52\bitstream.c

 # End Source File

 # Begin Source File

diff --git a/win32/xineplug_decode_mpeg2.dsp b/win32/xineplug_decode_mpeg2.dsp
index 7ec9ae526..20f948e67 100644
--- a/win32/xineplug_decode_mpeg2.dsp
+++ b/win32/xineplug_decode_mpeg2.dsp
@@ -142,6 +142,10 @@ SOURCE=..\src\libmpeg2\slice.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\libmpeg2\slice_xvmc.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\libmpeg2\stats.c

 # End Source File

 # Begin Source File