Changeset e98aae28c0040819f43bde6259ec95d3029deedf

Timestamp:

04/05/02 05:27:27 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1017977247 +0000

git-parent:

[cf5b3832dc6ad3fb4e55e9506e7e803d3e26ed53]

git-author:

Sam Hocevar <sam@videolan.org> 1017977247 +0000

Message:

• ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
  
• ./plugins/win32/Makefile: intfwin.so can be built using commandline.
  
• ./configure.in, ./include/threads.h, ./include/common.h: a custom defs.h
  file isn't needed for the intfwin plugin anymore.
  
• ./INSTALL.win32: updated compilation instructions for the intfwin plugin.
  

Files:

• ChangeLog (modified) (1 diff)
• INSTALL.win32 (modified) (1 diff)
• Makefile (modified) (1 diff)
• Makefile.modules (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)
• include/common.h (modified) (2 diffs)
• include/threads.h (modified) (30 diffs)
• plugins/win32/Makefile (modified) (1 diff)
• plugins/win32/intfwin.bpr (modified) (1 diff)

ChangeLog

@@ -5 +5 @@
-HEAD
-
+  * ./plugins/win32/intfwin.bpr: we now build intfwin.so at the right place.
+  * ./plugins/win32/Makefile: intfwin.so can be built using commandline.
+  * ./configure.in, ./include/threads.h, ./include/common.h: a custom defs.h
+    file isn't needed for the intfwin plugin anymore.
+  * ./INSTALL.win32: updated compilation instructions for the intfwin plugin.
-  * ./AUTHORS: added ipkiss.
-  * ./plugins/win32/mainframe.cpp: disabled the "hide interface" menu

INSTALL.win32

@@ -129 +129 @@
-include\defs.h should be generated.
-
-
-
-
-
-
-
-
-
-
-
-
+
-as follows:
-
+
+
+
-make -fintfwin      // It's Borland's make utility !
-
-5
+3
-You can remove any other generated file.
-

Makefile

@@ -143 +143 @@
-        vcd/vcd \
-        win32/waveout \
-win32
+intfwin
-        x11/x11 \
-        x11/xvideo

Makefile.modules

@@ -74 +74 @@
-    $(CC) $(CFLAGS) $(CFLAGS_EXTRA) -c $< -o $@
-
+# foo_CUSTOM lets us override all target rules for foo.so and foo.a
+ifeq (,$($(module_name)_CUSTOM))
-../$(module_name).so: $(EXTRA_DEP) $(OBJ_ALL)
-
+
+
-
-../$(module_name).a: $(EXTRA_DEP) $(OBJ_ALL)
-
+
+
+
+
-

configure

@@ -1228 +1228 @@
-
-cat >> confdefs.h <<EOF
-
+VLC_
-EOF
-
-cat >> confdefs.h <<EOF
-
+LC_V
-EOF
-
@@ -8223 +8223 @@
-s%@MOC@%$MOC%g
-s%@DLL_PATH@%$DLL_PATH%g
-PACKAGE@%$
-ERSION@%$
+VLC_PACKAGE@%$VLC_
+LC_VERSION@%$VLC_
-s%@PLDFLAGS@%$PLDFLAGS%g
-s%@LIB_COMMON@%$LIB_COMMON%g

configure.in

@@ -40 +40 @@
-ALL_LINGUAS="de fr ja no ru nl"
-
-
-
+VLC_
+LC_V
-AM_GNU_GETTEXT
-
@@ -1421 +1421 @@
-AC_SUBST(WINDRES)
-AC_SUBST(DLL_PATH)
-
-
+VLC_
+LC_V
-
-AC_SUBST(LDFLAGS)

include/common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-2 2002/04/05 01:05:22 gbazin
+3 2002/04/05 03:27:27 sam
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -477 +477 @@
- * I18n stuff
- *****************************************************************************/
-
+
+
+
+
+
+
-#   include <libintl.h>
-#else

include/threads.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-39 2002/04/02 23:43:57 gbazin
+40 2002/04/05 03:27:27 sam
- *
- * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
@@ -36 +36 @@
-#   include <st.h>
-
+#elif defined( WIN32 )
+#   include <process.h>
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )  /* pthreads (like Linux & BSD) */
-#   include <pthread.h>
@@ -53 +56 @@
-#   include <byteorder.h>
-
-#elif defined( WIN32 )
-#   include <process.h>
-
-#else
-#   error no threads available on your system !
@@ -100 +100 @@
-typedef st_mutex_t *     vlc_mutex_t;
-typedef st_cond_t *      vlc_cond_t;
+
+#elif defined( WIN32 )
+typedef HANDLE vlc_thread_t;
+
+typedef struct
+{
+    CRITICAL_SECTION csection;
+    HANDLE           mutex;
+} vlc_mutex_t;
+
+typedef struct
+{
+    int             i_waiting_threads;
+    HANDLE          signal;
+} vlc_cond_t;
+
+typedef unsigned (__stdcall *PTHREAD_START) (void *);
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -145 +162 @@
-} vlc_cond_t;
-
-#elif defined( WIN32 )
-typedef HANDLE vlc_thread_t;
-
-typedef struct
-{
-    CRITICAL_SECTION csection;
-    HANDLE           mutex;
-} vlc_mutex_t;
-
-typedef struct
-{
-    int             i_waiting_threads;
-    HANDLE          signal;
-} vlc_cond_t;
-
-typedef unsigned (__stdcall *PTHREAD_START) (void *);
-
-#endif
-
@@ -217 +217 @@
-    return st_init();
-
-PTHREAD_COND_T_IN_PTHREAD_H
-
-
-HAVE_CTHREADS
-
-
-KERNEL_SCHEDULER
-
-
-WIN32
+WIN32
+
+
+PTHREAD_COND_T_IN_PTHREAD
+
+
+CTHREADS
+
+
+HAVE_KERNEL_SCHEDULER_H
-    return 0;
-
@@ -243 +243 @@
-    return 0;
-
-PTHREAD_COND_T_IN_PTHREAD_H
-
-
-HAVE_CTHREADS
-
-
-KERNEL_SCHEDULER
-
-
-WIN32
+WIN32
+
+
+PTHREAD_COND_T_IN_PTHREAD
+
+
+CTHREADS
+
+
+HAVE_KERNEL_SCHEDULER_H
-    return 0;
-
@@ -269 +269 @@
-    *p_mutex = st_mutex_new();
-    return ( *p_mutex == NULL ) ? errno : 0;
+
+#elif defined( WIN32 )
+    /* We use mutexes on WinNT/2K/XP because we can use the SignalObjectAndWait
+     * function and have a 100% correct vlc_cond_wait() implementation.
+     * As this function is not available on Win9x, we can use the faster
+     * CriticalSections */
+    if( (GetVersion() < 0x80000000) && !p_main_sys->b_fast_pthread )
+    {
+        /* We are running on NT/2K/XP, we can use SignalObjectAndWait */
+        p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
+        return ( p_mutex->mutex ? 0 : 1 );
+    }
+    else
+    {
+        InitializeCriticalSection( &p_mutex->csection );
+        p_mutex->mutex = NULL;
+        return 0;
+    }
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -311 +329 @@
-    return B_OK;
-
-#elif defined( WIN32 )
-    /* We use mutexes on WinNT/2K/XP because we can use the SignalObjectAndWait
-     * function and have a 100% correct vlc_cond_wait() implementation.
-     * As this function is not available on Win9x, we can use the faster
-     * CriticalSections */
-    if( (GetVersion() < 0x80000000) && !p_main_sys->b_fast_pthread )
-    {
-        /* We are running on NT/2K/XP, we can use SignalObjectAndWait */
-        p_mutex->mutex = CreateMutex( 0, FALSE, 0 );
-        return ( p_mutex->mutex ? 0 : 1 );
-    }
-    else
-    {
-        InitializeCriticalSection( &p_mutex->csection );
-        p_mutex->mutex = NULL;
-        return 0;
-    }
-
-#endif
-}
@@ -352 +352 @@
-    return st_mutex_lock( *p_mutex );
-
+#elif defined( WIN32 )
+    if( p_mutex->mutex )
+    {
+        WaitForSingleObject( p_mutex->mutex, INFINITE );
+    }
+    else
+    {
+        EnterCriticalSection( &p_mutex->csection );
+    }
+    return 0;
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    int i_return = pthread_mutex_lock( p_mutex );
@@ -380 +391 @@
-    err = acquire_sem( p_mutex->lock );
-    return err;
-
-#elif defined( WIN32 )
-    if( p_mutex->mutex )
-    {
-        WaitForSingleObject( p_mutex->mutex, INFINITE );
-    }
-    else
-    {
-        EnterCriticalSection( &p_mutex->csection );
-    }
-    return 0;
-
-#endif
@@ -415 +415 @@
-    return st_mutex_unlock( *p_mutex );
-
+#elif defined( WIN32 )
+    if( p_mutex->mutex )
+    {
+        ReleaseMutex( p_mutex->mutex );
+    }
+    else
+    {
+        LeaveCriticalSection( &p_mutex->csection );
+    }
+    return 0;
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    int i_return = pthread_mutex_unlock( p_mutex );
@@ -441 +452 @@
-    release_sem( p_mutex->lock );
-    return B_OK;
-
-#elif defined( WIN32 )
-    if( p_mutex->mutex )
-    {
-        ReleaseMutex( p_mutex->mutex );
-    }
-    else
-    {
-        LeaveCriticalSection( &p_mutex->csection );
-    }
-    return 0;
-
-#endif
@@ -476 +476 @@
-    return st_mutex_destroy( *p_mutex );
-
+#elif defined( WIN32 )
+    if( p_mutex->mutex )
+    {
+        CloseHandle( p_mutex->mutex );
+    }
+    else
+    {
+        DeleteCriticalSection( &p_mutex->csection );
+    }
+    return 0;
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )    
-    int i_return = pthread_mutex_destroy( p_mutex );
@@ -497 +508 @@
-    return B_OK;
-
-#elif defined( WIN32 )
-    if( p_mutex->mutex )
-    {
-        CloseHandle( p_mutex->mutex );
-    }
-    else
-    {
-        DeleteCriticalSection( &p_mutex->csection );
-    }
-    return 0;
-
-#endif    
-}
@@ -522 +522 @@
-    *p_condvar = st_cond_new();
-    return ( *p_condvar == NULL ) ? errno : 0;
+
+#elif defined( WIN32 )
+    /* initialise counter */
+    p_condvar->i_waiting_threads = 0;
+
+    /* Create an auto-reset event. */
+    p_condvar->signal = CreateEvent( NULL, /* no security */
+                                     FALSE,  /* auto-reset event */
+                                     FALSE,  /* non-signaled initially */
+                                     NULL ); /* unnamed */
+
+    return( !p_condvar->signal );
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -550 +562 @@
-    return 0;
-
-#elif defined( WIN32 )
-    /* initialise counter */
-    p_condvar->i_waiting_threads = 0;
-
-    /* Create an auto-reset event. */
-    p_condvar->signal = CreateEvent( NULL, /* no security */
-                                     FALSE,  /* auto-reset event */
-                                     FALSE,  /* non-signaled initially */
-                                     NULL ); /* unnamed */
-
-    return( !p_condvar->signal );
-    
-#endif
-}
@@ -575 +575 @@
-#elif defined( ST_INIT_IN_ST_H )
-    return st_cond_signal( *p_condvar );
+
+#elif defined( WIN32 )
+    /* Release one waiting thread if one is available. */
+    /* For this trick to work properly, the vlc_cond_signal must be surrounded
+     * by a mutex. This will prevent another thread from stealing the signal */
+    PulseEvent( p_condvar->signal );
+    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -623 +630 @@
-    return 0;
-
-#elif defined( WIN32 )
-    /* Release one waiting thread if one is available. */
-    /* For this trick to work properly, the vlc_cond_signal must be surrounded
-     * by a mutex. This will prevent another thread from stealing the signal */
-    PulseEvent( p_condvar->signal );
-    return 0;
-
-#endif
-}
@@ -648 +648 @@
-#elif defined( ST_INIT_IN_ST_H )
-    return st_cond_broadcast( p_condvar );
+
+#elif defined( WIN32 )
+    /* Release all waiting threads. */
+    /* For this trick to work properly, the vlc_cond_signal must be surrounded
+     * by a mutex. This will prevent another thread from stealing the signal */
+    while( p_condvar->i_waiting_threads )
+    {
+        PulseEvent( p_condvar->signal );
+        Sleep( 1 ); /* deschedule the current thread */
+    }
+    return 0;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
@@ -696 +707 @@
-    return 0;
-
-#elif defined( WIN32 )
-    /* Release all waiting threads. */
-    /* For this trick to work properly, the vlc_cond_signal must be surrounded
-     * by a mutex. This will prevent another thread from stealing the signal */
-    while( p_condvar->i_waiting_threads )
-    {
-        PulseEvent( p_condvar->signal );
-        Sleep( 1 ); /* deschedule the current thread */
-    }
-    return 0;
-
-#endif
-}
@@ -736 +736 @@
-
-    return i_ret;
-
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-
-#ifndef DEBUG
-    return pthread_cond_wait( p_condvar, p_mutex );
-#else
-    /* In debug mode, timeout */
-    struct timeval now;
-    struct timespec timeout;
-    int    i_result;
-
-    for( ; ; )
-    {
-        gettimeofday( &now, NULL );
-        timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
-        timeout.tv_nsec = now.tv_usec * 1000;
-
-        i_result = pthread_cond_timedwait( p_condvar, p_mutex, &timeout );
-
-        if( i_result == ETIMEDOUT )
-        {
-            intf_WarnMsg( 1, "thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)",
-                          pthread_self(), psz_file, i_line, strerror(i_result) );
-            continue;
-        }
-
-        if( i_result )
-        {
-            intf_ErrMsg( "thread %d error: cond_wait failed at %s:%d (%s)",
-                         pthread_self(), psz_file, i_line, strerror(i_result) );
-        }
-        return( i_result );
-    }
-#endif
-
-#elif defined( HAVE_CTHREADS_H )
-    condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
-    return 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    if( !p_condvar )
-    {
-        return B_BAD_VALUE;
-    }
-
-    if( !p_mutex )
-    {
-        return B_BAD_VALUE;
-    }
-
-    if( p_condvar->init < 2000 )
-    {
-        return B_NO_INIT;
-    }
-
-    /* The p_condvar->thread var is initialized before the unlock because
-     * it enables to identify when the thread is interrupted beetwen the
-     * unlock line and the suspend_thread line */
-    p_condvar->thread = find_thread( NULL );
-    vlc_mutex_unlock( p_mutex );
-    suspend_thread( p_condvar->thread );
-    p_condvar->thread = -1;
-
-    vlc_mutex_lock( p_mutex );
-    return 0;
-
-#elif defined( WIN32 )
@@ -834 +769 @@
-    return( i_result == WAIT_FAILED );
-
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+
+#ifndef DEBUG
+    return pthread_cond_wait( p_condvar, p_mutex );
+#else
+    /* In debug mode, timeout */
+    struct timeval now;
+    struct timespec timeout;
+    int    i_result;
+
+    for( ; ; )
+    {
+        gettimeofday( &now, NULL );
+        timeout.tv_sec = now.tv_sec + THREAD_COND_TIMEOUT;
+        timeout.tv_nsec = now.tv_usec * 1000;
+
+        i_result = pthread_cond_timedwait( p_condvar, p_mutex, &timeout );
+
+        if( i_result == ETIMEDOUT )
+        {
+            intf_WarnMsg( 1, "thread %d warning: Possible deadlock detected in cond_wait at %s:%d (%s)",
+                          pthread_self(), psz_file, i_line, strerror(i_result) );
+            continue;
+        }
+
+        if( i_result )
+        {
+            intf_ErrMsg( "thread %d error: cond_wait failed at %s:%d (%s)",
+                         pthread_self(), psz_file, i_line, strerror(i_result) );
+        }
+        return( i_result );
+    }
+#endif
+
+#elif defined( HAVE_CTHREADS_H )
+    condition_wait( (condition_t)p_condvar, (mutex_t)p_mutex );
+    return 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+    if( !p_condvar )
+    {
+        return B_BAD_VALUE;
+    }
+
+    if( !p_mutex )
+    {
+        return B_BAD_VALUE;
+    }
+
+    if( p_condvar->init < 2000 )
+    {
+        return B_NO_INIT;
+    }
+
+    /* The p_condvar->thread var is initialized before the unlock because
+     * it enables to identify when the thread is interrupted beetwen the
+     * unlock line and the suspend_thread line */
+    p_condvar->thread = find_thread( NULL );
+    vlc_mutex_unlock( p_mutex );
+    suspend_thread( p_condvar->thread );
+    p_condvar->thread = -1;
+
+    vlc_mutex_lock( p_mutex );
+    return 0;
+
-#endif
-}
@@ -857 +857 @@
-    return st_cond_destroy( *p_condvar );
-
+#elif defined( WIN32 )
+    return( !CloseHandle( p_condvar->signal ) );
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    int i_result = pthread_cond_destroy( p_condvar );
@@ -872 +875 @@
-    p_condvar->init = 0;
-    return 0;
-
-#elif defined( WIN32 )
-    return( !CloseHandle( p_condvar->signal ) );
-
-#endif    
@@ -923 +923 @@
-    i_ret = ( p_thread == NULL );
-    
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_ret = pthread_create( p_thread, NULL, func, p_data );
-
-#elif defined( HAVE_CTHREADS_H )
-    *p_thread = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
-    i_ret = 0;
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    *p_thread = spawn_thread( (thread_func)func, psz_name,
-                              B_NORMAL_PRIORITY, p_data );
-    i_ret = resume_thread( *p_thread );
-
-#elif defined( WIN32 )
-    unsigned threadID;
@@ -945 +933 @@
-    i_ret = ( *p_thread ? 0 : 1 );
-
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    i_ret = pthread_create( p_thread, NULL, func, p_data );
+
+#elif defined( HAVE_CTHREADS_H )
+    *p_thread = cthread_fork( (cthread_fn_t)func, (any_t)p_data );
+    i_ret = 0;
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+    *p_thread = spawn_thread( (thread_func)func, psz_name,
+                              B_NORMAL_PRIORITY, p_data );
+    i_ret = resume_thread( *p_thread );
+
-#endif
-
@@ -984 +984 @@
-    st_thread_exit( &result );
-    
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    pthread_exit( 0 );
-
-#elif defined( HAVE_CTHREADS_H )
-    int result;
-    cthread_exit( &result );
-
-#elif defined( HAVE_KERNEL_SCHEDULER_H )
-    exit_thread( 0 );
-
-#elif defined( WIN32 )
-    /* For now we don't close the thread handles (because of race conditions).
-     * Need to be looked at. */
-    _endthreadex(0);
+
+#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
+    pthread_exit( 0 );
+
+#elif defined( HAVE_CTHREADS_H )
+    int result;
+    cthread_exit( &result );
+
+#elif defined( HAVE_KERNEL_SCHEDULER_H )
+    exit_thread( 0 );
-
-#endif
@@ -1024 +1024 @@
-    i_ret = st_thread_join( thread, NULL );
-    
+#elif defined( WIN32 )
+    WaitForSingleObject( thread, INFINITE );
+
-#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
-    i_ret = pthread_join( thread, NULL );
@@ -1034 +1037 @@
-    int32 exit_value;
-    wait_for_thread( thread, &exit_value );
-
-#elif defined( WIN32 )
-    WaitForSingleObject( thread, INFINITE );
-
-#endif

plugins/win32/Makefile

@@ -1 @@
-
+
+
+
-waveout_SOURCES = waveout.c
+
+#
+# Borland C++ project
+# we override everything by setting intfwin_CUSTOM
+#
+intfwin_CUSTOM = yes
+BCBUILDER = "D:/Program Files/CBuilder5"
+
+../intfwin.so: Makefile
+    rm -f intfwin.mak
+    $(BCBUILDER)/Bin/bpr2mak intfwin.bpr -s | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -DPLUGIN -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' > intfwin.mak
+    $(BCBUILDER)/Bin/make -f intfwin.mak -b
+

plugins/win32/intfwin.bpr

@@ -4 +4 @@
-  <MACROS>
-    <VERSION value="BCB.05.03"/>
-
+..\
-    <OBJFILES value="win32.obj intf_win32.obj mainframe.obj network.obj playlist.obj 
-      preferences.obj about.obj disc.obj control.obj menu.obj messages.obj"/>