* ./plugins/win32/*, ./plugins/directx/*: Win32 compilation fixes (but

    still not working under Borland).

plugins/directx/directx.c

@@ -2,7 +2,7 @@
  * directx.c : Windows DirectX plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: directx.c,v 1.12 2002/07/31 20:56:51 sam Exp $
+ * $Id: directx.c,v 1.13 2002/07/31 22:37:28 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *      
@@ -56,7 +56,7 @@ vlc_module_begin();
     add_category_hint( N_("Video"), NULL );
     add_bool( "directx-hw-yuv", 1, NULL, HW_YUV_TEXT, HW_YUV_LONGTEXT );
     add_bool( "directx-use-sysmem", 0, NULL, SYSMEM_TEXT, SYSMEM_LONGTEXT );
-    set_description( _("DirectX extension module") )
+    set_description( _("DirectX extension module") );
     add_submodule();
         set_capability( "video output", 150 );
         set_callbacks( E_(OpenVideo), E_(CloseVideo) );

plugins/directx/vout_directx.c

@@ -2,7 +2,7 @@
  * vout_directx.c: Windows DirectX video output display method
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: vout_directx.c,v 1.42 2002/07/31 20:56:51 sam Exp $
+ * $Id: vout_directx.c,v 1.43 2002/07/31 22:37:28 sam Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -60,6 +60,9 @@ DEFINE_GUID( IID_IDirectDrawSurface2, 0x57805885,0x6eec,0x11cf,0x94,0x41,0xa8,0x
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
+int  E_(OpenVideo)    ( vlc_object_t * );
+void E_(CloseVideo)   ( vlc_object_t * );
+
 static int  Init      ( vout_thread_t * );
 static void End       ( vout_thread_t * );
 static int  Manage    ( vout_thread_t * );
@@ -172,7 +175,7 @@ int E_(OpenVideo) ( vlc_object_t *p_this )
     return 0;
 
  error:
-    Destroy( p_vout );
+    E_(CloseVideo)( VLC_OBJECT(p_vout) );
     return 1;
 
 }

plugins/win32/intf_win32.cpp

@@ -52,7 +52,7 @@ int E_(Open)( vlc_object_t *p_this )
     intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
     /* Allocate instance and initialize some members */
-    p_intf->p_sys = (intf_sys_s *) malloc( sizeof( intf_sys_t ) );
+    p_intf->p_sys = (intf_sys_t *) malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
     {
         msg_Err( p_intf, "out of memory" );

plugins/win32/preferences.cpp

@@ -190,7 +190,7 @@ void __fastcall TGroupBoxPlugin::ListViewSelectItem( TObject *Sender,
     if( Name != "" )
     {
         /* look for module 'Name' */
-        for( p_module = p_intfGlobal->p_vlc->module_bank.first ;
+        for( p_module = p_intfGlobal->p_vlc->p_module_bank->first ;
              p_module != NULL ;
              p_module = p_module->next )
         {
@@ -374,7 +374,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
     TListItem          *ListItem;
 
     /* Look for the selected module */
-    for( p_module = p_intfGlobal->p_vlc->module_bank.first ; p_module != NULL ;
+    for( p_module = p_intfGlobal->p_vlc->p_module_bank->first ; p_module != NULL ;
          p_module = p_module->next )
     {
         if( psz_module_name
@@ -422,8 +422,9 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
             /* add panel as separator */
             ADD_PANEL;
 
+#if 0 /* FIXME */
             /* build a list of available plugins */
-            for( p_module_plugins = p_intfGlobal->p_vlc->module_bank.first ;
+            for( p_module_plugins = p_intfGlobal->p_vlc->p_module_bank->first ;
                  p_module_plugins != NULL ;
                  p_module_plugins = p_module_plugins->next )
             {
@@ -434,6 +435,7 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
                     ListItem->Caption = p_module_plugins->psz_object_name;
                 }
             }
+#endif
 
             break;