Commit 081cc1e7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: disable IPC in WinStoreApp mode

IPC and one instance depends on HWND and calls will fail.
parent 5a369686
...@@ -97,6 +97,7 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_ ...@@ -97,6 +97,7 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_
} }
} }
#if !defined(WINAPI_FAMILY_APP)
if( var_InheritBool( p_this, "one-instance" ) if( var_InheritBool( p_this, "one-instance" )
|| ( var_InheritBool( p_this, "one-instance-when-started-from-file" ) || ( var_InheritBool( p_this, "one-instance-when-started-from-file" )
&& var_InheritBool( p_this, "started-from-file" ) ) ) && var_InheritBool( p_this, "started-from-file" ) ) )
...@@ -206,8 +207,10 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_ ...@@ -206,8 +207,10 @@ void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_
exit( 0 ); exit( 0 );
} }
} }
#endif
} }
#if !defined(WINAPI_FAMILY_APP)
static unsigned __stdcall IPCHelperThread( void *data ) static unsigned __stdcall IPCHelperThread( void *data )
{ {
vlc_object_t *p_this = data; vlc_object_t *p_this = data;
...@@ -313,12 +316,14 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam, ...@@ -313,12 +316,14 @@ LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
return DefWindowProc( hwnd, uMsg, wParam, lParam ); return DefWindowProc( hwnd, uMsg, wParam, lParam );
} }
#endif
/** /**
* Cleans up after system_Init() and system_Configure(). * Cleans up after system_Init() and system_Configure().
*/ */
void system_End(void) void system_End(void)
{ {
#if !defined(WINAPI_FAMILY_APP)
HWND ipcwindow; HWND ipcwindow;
/* FIXME: thread-safety... */ /* FIXME: thread-safety... */
...@@ -331,6 +336,7 @@ void system_End(void) ...@@ -331,6 +336,7 @@ void system_End(void)
vlc_object_release (p_helper); vlc_object_release (p_helper);
p_helper = NULL; p_helper = NULL;
} }
#endif
timeEndPeriod(5); timeEndPeriod(5);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment