# include "config.h"
#endif
+#ifndef UNICODE
#define UNICODE
+#endif
+
#include <vlc/vlc.h>
#include <windows.h>
#include <shellapi.h>
putenv("VLC_DATA_PATH=Z:"TOP_SRCDIR"/share");
#endif
+ SetErrorMode(SEM_FAILCRITICALERRORS);
HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
/* SetProcessDEPPolicy */
if (wargv == NULL)
return 1;
- char *argv[argc + 3];
+ char *argv[argc + 4];
BOOL crash_handling = TRUE;
int j = 0;
+ char *lang = NULL;
argv[j++] = FromWide( L"--media-library" );
+ argv[j++] = FromWide( L"--stats" );
argv[j++] = FromWide( L"--no-ignore-config" );
for (int i = 1; i < argc; i++)
{
crash_handling = FALSE;
continue; /* don't give argument to libvlc */
}
+ if (!wcsncmp(wargv[i], L"--language", 10) )
+ {
+ if (i < argc - 1 && wcsncmp( wargv[i + 1], L"--", 2 ))
+ lang = FromWide (wargv[++i]);
+ continue;
+ }
argv[j++] = FromWide (wargv[i]);
}
if( S_OK != SHGetFolderPathW( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE,
NULL, SHGFP_TYPE_CURRENT, path ) )
fprintf( stderr, "Can't open the vlc conf PATH\n" );
- swprintf( path+wcslen( path ), L"%s", L"\\vlc\\crashdump" );
+ _snwprintf( path+wcslen( path ), MAX_PATH, L"%s", L"\\vlc\\crashdump" );
crashdump_path = &path[0];
check_crashdump();
_setmode( STDIN_FILENO, _O_BINARY ); /* Needed for pipes */
+ /* */
+ if (!lang)
+ {
+ HKEY h_key;
+ if( RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Software\\VideoLAN\\VLC\\"), 0, KEY_READ, &h_key )
+ == ERROR_SUCCESS )
+ {
+ TCHAR szData[256];
+ DWORD len = 256;
+ if( RegQueryValueEx( h_key, TEXT("Lang"), NULL, NULL, (LPBYTE) &szData, &len ) == ERROR_SUCCESS )
+ lang = FromWide( szData );
+ }
+ }
+
+ if (lang && strncmp( lang, "auto", 4 ) )
+ {
+ char tmp[11];
+ snprintf(tmp, 11, "LANG=%s", lang);
+ putenv(tmp);
+ }
+ free(lang);
+
/* Initialize libvlc */
libvlc_instance_t *vlc;
vlc = libvlc_new (argc, (const char **)argv);
if (vlc != NULL)
{
+ libvlc_set_app_id (vlc, "org.VideoLAN.VLC", PACKAGE_VERSION,
+ PACKAGE_NAME);
libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
libvlc_add_intf (vlc, "hotkeys,none");
libvlc_add_intf (vlc, "globalhotkeys,none");
libvlc_wait (vlc);
libvlc_release (vlc);
}
+ else
+ MessageBox (NULL, TEXT("VLC media player could not start.\n"
+ "Either the command line options were invalid or no plugins were found.\n"),
+ TEXT("VLC media player"),
+ MB_OK|MB_ICONERROR);
+
for (int i = 0; i < argc; i++)
free (argv[i]);
SYSTEMTIME now;
GetSystemTime(&now);
wchar_t remote_file[MAX_PATH];
- swprintf(remote_file,
+ _snwprintf(remote_file, MAX_PATH,
L"/crashes-win32/%04d%02d%02d%02d%02d%02d",
now.wYear, now.wMonth, now.wDay, now.wHour,
now.wMinute, now.wSecond );
for( unsigned int i = 0; i < pException->NumberParameters; i++ )
fwprintf( fd, L" | %p", pException->ExceptionInformation[i] );
-#ifdef WIN64
+#ifdef _WIN64
fwprintf( fd, L"\n\n[context]\nRDI:%px\nRSI:%px\n" \
"RBX:%px\nRDX:%px\nRCX:%px\nRAX:%px\n" \
"RBP:%px\nRIP:%px\nRSP:%px\nR8:%px\n" \
fwprintf( fd, L"\n[stacktrace]\n#EIP|base|module\n" );
-#ifdef WIN64
+#ifdef _WIN64
LPCVOID caller = (LPCVOID)pContext->Rip;
LPVOID *pBase = (LPVOID*)pContext->Rbp;
#else