Rework threading:

[vlc] / src / misc / win32_specific.c

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index 75b5fee4aae1b87cdc058c851b0f5b8ffafe74fd..137ac397db21ad315f1da71d872b05737959aebf 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -21,8 +21,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-#include <string.h>                                              /* strdup() */
-#include <stdlib.h>                                                /* free() */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include "../libvlc.h"
@@ -43,7 +45,7 @@
 /*****************************************************************************
  * system_Init: initialize winsock and misc other things.
  *****************************************************************************/
-void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
+void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
 {
     WSADATA Data;
 
@@ -75,7 +77,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
 
 #ifndef HAVE_RELEASE
     {
-        /* remove trailing \.libs from executable dir path if seen, 
+        /* remove trailing \.libs from executable dir path if seen,
            we assume we are running vlc through libtool wrapper in build dir */
         int offset  = strlen(psz_path)-sizeof("\\.libs")+1;
         if( offset > 0 )
@@ -86,7 +88,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
     }
 #endif
 
-    vlc_global( p_this )->psz_vlcpath = strdup( psz_path );
+    vlc_global()->psz_vlcpath = strdup( psz_path );
 
     /* Set the default file-translation mode */
 #if !defined( UNDER_CE )
@@ -130,8 +132,14 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
  *****************************************************************************/
 static void IPCHelperThread( vlc_object_t * );
 LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
+typedef struct
+{
+  int argc;
+  int enqueue;
+  char data[0];
+} vlc_ipc_data_t;
 
-void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
+void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
 {
 #if !defined( UNDER_CE )
     /* Raise default priority of the current process */
@@ -212,27 +220,31 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, char *ppsz_argv[] )
             if( *pi_argc - 1 >= optind )
             {
                 COPYDATASTRUCT wm_data;
-                int i_opt, i_data;
-                char *p_data;
+                int i_opt;
+                vlc_ipc_data_t *p_data;
+                size_t i_data = sizeof (*p_data);
 
-                i_data = sizeof(int);
                 for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
                 {
-                    i_data += sizeof(int);
+                    i_data += sizeof (size_t);
                     i_data += strlen( ppsz_argv[ i_opt ] ) + 1;
                 }
 
-                p_data = (char *)malloc( i_data );
-                *((int *)&p_data[0]) = *pi_argc - optind;
-                i_data = sizeof(int);
+                p_data = malloc( i_data );
+                p_data->argc = *pi_argc - optind;
+                p_data->enqueue = config_GetInt( p_this, "playlist-enqueue" );
+                i_data = 0;
                 for( i_opt = optind; i_opt < *pi_argc; i_opt++ )
                 {
-                    int i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
-                    *((int *)&p_data[i_data]) = i_len;
-                    i_data += sizeof(int);
-                    memcpy( &p_data[i_data], ppsz_argv[ i_opt ], i_len );
+                    size_t i_len = strlen( ppsz_argv[ i_opt ] ) + 1;
+                    /* Windows will never switch to an architecture
+                     * with stronger alignment requirements, right. */
+                    *((size_t *)(p_data->data + i_data)) = i_len;
+                    i_data += sizeof (size_t);
+                    memcpy( &p_data->data[i_data], ppsz_argv[ i_opt ], i_len );
                     i_data += i_len;
                 }
+                i_data += sizeof (*p_data);
 
                 /* Send our playlist items to the 1st instance */
                 wm_data.dwData = 0;
@@ -306,18 +318,16 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
 
         if( pwm_data->lpData )
         {
-            int i_argc, i_data, i_opt, i_options;
             char **ppsz_argv;
-            char *p_data = (char *)pwm_data->lpData;
+            vlc_ipc_data_t *p_data = (vlc_ipc_data_t *)pwm_data->lpData;
+            size_t i_data = 0;
+            int i_argc = p_data->argc, i_opt, i_options;
 
-            i_argc = *((int *)&p_data[0]);
             ppsz_argv = (char **)malloc( i_argc * sizeof(char *) );
-            i_data = sizeof(int);
             for( i_opt = 0; i_opt < i_argc; i_opt++ )
             {
-                ppsz_argv[i_opt] = &p_data[i_data + sizeof(int)];
-                i_data += *((int *)&p_data[i_data]);
-                i_data += sizeof(int);
+                ppsz_argv[i_opt] = p_data->data + i_data + sizeof(int);
+                i_data += sizeof(int) + *((int *)(p_data->data + i_data));
             }
 
             for( i_opt = 0; i_opt < i_argc; i_opt++ )
@@ -330,20 +340,12 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
                 {
                     i_options++;
                 }
-                if( i_opt || config_GetInt( p_this, "playlist-enqueue" ) )
-                {
-                  playlist_AddExt( p_playlist, ppsz_argv[i_opt],
-                    NULL, PLAYLIST_APPEND ,
-                    PLAYLIST_END, -1,
-                    (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
-                    i_options, VLC_TRUE, VLC_FALSE );
-                } else {
-                  playlist_AddExt( p_playlist, ppsz_argv[i_opt],
-                    NULL, PLAYLIST_APPEND | PLAYLIST_GO,
-                    PLAYLIST_END, -1,
-                    (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
-                    i_options, VLC_TRUE, VLC_FALSE );
-                }
+                playlist_AddExt( p_playlist, ppsz_argv[i_opt],
+                  NULL, PLAYLIST_APPEND |
+                        ( ( i_opt || p_data->enqueue ) ? 0 : PLAYLIST_GO ),
+                  PLAYLIST_END, -1,
+                  (char const **)( i_options ? &ppsz_argv[i_opt+1] : NULL ),
+                  i_options, VLC_TRUE, VLC_FALSE );
 
                 i_opt += i_options;
             }
@@ -362,11 +364,20 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
  *****************************************************************************/
 void system_End( libvlc_int_t *p_this )
 {
-    if( p_this && p_this->p_libvlc_global && vlc_global( p_this )->psz_vlcpath )
+    if( p_this && vlc_global() )
     {
-        free( vlc_global( p_this )->psz_vlcpath );
-        vlc_global( p_this )->psz_vlcpath = NULL;
+        free( vlc_global()->psz_vlcpath );
+        vlc_global()->psz_vlcpath = NULL;
     }
 
     WSACleanup();
 }
+
+/*****************************************************************************
+ *  system_VLCPath
+ *  **************************************************************************/
+const char* system_VLCPath( void )
+{
+    libvlc_global_data_t* libvlc_global = vlc_global();
+    return libvlc_global->psz_vlcpath;
+}