# ifndef _WIN32_IE
# define _WIN32_IE 0x501
# endif
+# include <fcntl.h>
+# include <io.h>
# include <shlobj.h>
# include <wininet.h>
+# define PSAPI_VERSION 1
+# include <psapi.h>
# define HeapEnableTerminationOnCorruption (HEAP_INFORMATION_CLASS)1
-# ifndef _WIN64
static void check_crashdump(void);
LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo);
-# endif
+static const wchar_t *crashdump_path;
#endif
#ifndef UNDER_CE
int nCmdShow )
{
int argc;
+
#ifndef UNDER_CE
+#ifdef TOP_BUILDDIR
+ putenv("VLC_PLUGIN_PATH=Z:"TOP_BUILDDIR"/modules");
+#endif
+
HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
/* SetProcessDEPPolicy */
if(h_Kernel32)
{
BOOL (WINAPI * mySetProcessDEPPolicy)( DWORD dwFlags);
+ BOOL (WINAPI * mySetDllDirectoryA)(const char* lpPathName);
# define PROCESS_DEP_ENABLE 1
mySetProcessDEPPolicy = (BOOL WINAPI (*)(DWORD))
GetProcAddress(h_Kernel32, "SetProcessDEPPolicy");
if(mySetProcessDEPPolicy)
mySetProcessDEPPolicy(PROCESS_DEP_ENABLE);
+
+ /* Do NOT load any library from cwd. */
+ mySetDllDirectoryA = (BOOL WINAPI (*)(const char*)) GetProcAddress(h_Kernel32, "SetDllDirectoryA");
+ if(mySetDllDirectoryA)
+ mySetDllDirectoryA("");
+
FreeLibrary(h_Kernel32);
}
if (wargv == NULL)
return 1;
- char *argv[argc + 2];
+ char *argv[argc + 3];
BOOL crash_handling = TRUE;
int j = 0;
argv[j++] = FromWide( L"--media-library" );
argv[j++] = FromWide( L"--no-ignore-config" );
+#ifdef TOP_SRCDIR
+ argv[j++] = FromWide (L"--data-path=Z:"TOP_SRCDIR"/share");
+#endif
for (int i = 1; i < argc; i++)
{
if(!wcscmp(wargv[i], L"--no-crashdump"))
argv[argc] = NULL;
LocalFree (wargv);
-# ifndef _WIN64
- /* We don't know how to manage crashes on Win64 yet */
if(crash_handling)
{
+ static wchar_t path[MAX_PATH];
+ 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" );
+ crashdump_path = &path[0];
+
check_crashdump();
SetUnhandledExceptionFilter(vlc_exception_filter);
}
-# endif
+
+ _setmode( _fileno( stdin ), _O_BINARY ); /* Needed for pipes */
#else /* UNDER_CE */
char **argv, psz_cmdline[wcslen(lpCmdLine) * 4];
return 0;
}
-#if !defined( UNDER_CE ) && !defined( _WIN64 )
+#if !defined( UNDER_CE )
/* Crashdumps handling */
-static void get_crashdump_path(wchar_t * wdir)
+static void check_crashdump(void)
{
- if( S_OK != SHGetFolderPathW( NULL,
- CSIDL_APPDATA | CSIDL_FLAG_CREATE,
- NULL, SHGFP_TYPE_CURRENT, wdir ) )
- fprintf( stderr, "Can't open the vlc conf PATH\n" );
-
- swprintf( wdir+wcslen( wdir ), L"%s", L"\\vlc\\crashdump" );
-}
+ FILE * fd = _wfopen ( crashdump_path, L"r, ccs=UTF-8" );
+ if( !fd )
+ return;
+ fclose( fd );
-static void check_crashdump()
-{
- wchar_t * wdir = (wchar_t *)malloc(sizeof(wchar_t)*MAX_PATH);
- get_crashdump_path(wdir);
+ int answer = MessageBox( NULL, L"VLC media player just crashed." \
+ " Do you want to send a bug report to the developers team?",
+ L"VLC crash reporting", MB_YESNO);
- FILE * fd = _wfopen ( wdir, L"r, ccs=UTF-8" );
- if( fd )
+ if(answer == IDYES)
{
- fclose( fd );
- int answer = MessageBox( NULL, L"VLC media player just crashed." \
- " Do you want to send a bug report to the developers team?",
- L"VLC crash reporting", MB_YESNO);
-
- if(answer == IDYES)
+ HINTERNET Hint = InternetOpen(L"VLC Crash Reporter", INTERNET_OPEN_TYPE_PRECONFIG, NULL,NULL,0);
+ if(Hint)
{
- HINTERNET Hint = InternetOpen(L"VLC Crash Reporter", INTERNET_OPEN_TYPE_PRECONFIG, NULL,NULL,0);
- if(Hint)
+ HINTERNET ftp = InternetConnect(Hint, L"crash.videolan.org", INTERNET_DEFAULT_FTP_PORT,
+ NULL, NULL, INTERNET_SERVICE_FTP, 0, 0);
+ if(ftp)
{
- HINTERNET ftp = InternetConnect(Hint, L"crash.videolan.org", INTERNET_DEFAULT_FTP_PORT,
- NULL, NULL, INTERNET_SERVICE_FTP, 0, 0);
- if(ftp)
- {
- SYSTEMTIME now;
- GetSystemTime(&now);
- wchar_t remote_file[MAX_PATH];
- swprintf( remote_file, L"/crashs/%04d%02d%02d%02d%02d%02d",now.wYear,
- now.wMonth, now.wDay, now.wHour, now.wMinute, now.wSecond );
-
- if( FtpPutFile( ftp, wdir, remote_file, FTP_TRANSFER_TYPE_BINARY, 0) )
- MessageBox( NULL, L"Report sent correctly. Thanks a lot for the help.",
- L"Report sent", MB_OK);
- else
- MessageBox( NULL, L"There was an error while transferring to the FTP server. "\
- "Thanks a lot for the help anyway.",
- L"Report sending failed", MB_OK);
- InternetCloseHandle(ftp);
- }
+ SYSTEMTIME now;
+ GetSystemTime(&now);
+ wchar_t remote_file[MAX_PATH];
+ swprintf( remote_file, L"/crashes-win32/%04d%02d%02d%02d%02d%02d",
+ now.wYear, now.wMonth, now.wDay, now.wHour, now.wMinute, now.wSecond );
+
+ if( FtpPutFile( ftp, crashdump_path, remote_file, FTP_TRANSFER_TYPE_BINARY, 0) )
+ MessageBox( NULL, L"Report sent correctly. Thanks a lot for the help.",
+ L"Report sent", MB_OK);
else
- {
- MessageBox( NULL, L"There was an error while connecting to the FTP server. "\
- "Thanks a lot for the help anyway.",
- L"Report sending failed", MB_OK);
- fprintf(stderr,"Can't connect to FTP server%d\n",GetLastError());
- }
- InternetCloseHandle(Hint);
+ MessageBox( NULL, L"There was an error while transferring to the FTP server. "\
+ "Thanks a lot for the help anyway.",
+ L"Report sending failed", MB_OK);
+ InternetCloseHandle(ftp);
}
else
{
- MessageBox( NULL, L"There was an error while connecting to Internet. "\
- "Thanks a lot for the help anyway.",
- L"Report sending failed", MB_OK);
+ MessageBox( NULL, L"There was an error while connecting to the FTP server. "\
+ "Thanks a lot for the help anyway.",
+ L"Report sending failed", MB_OK);
+ fprintf(stderr,"Can't connect to FTP server 0x%08lu\n",
+ (unsigned long)GetLastError());
}
+ InternetCloseHandle(Hint);
+ }
+ else
+ {
+ MessageBox( NULL, L"There was an error while connecting to Internet. "\
+ "Thanks a lot for the help anyway.",
+ L"Report sending failed", MB_OK);
}
-
- _wremove(wdir);
}
- free((void *)wdir);
+
+ _wremove(crashdump_path);
}
/*****************************************************************************
{
fprintf( stderr, "unhandled vlc exception\n" );
- wchar_t * wdir = (wchar_t *)malloc(sizeof(wchar_t)*MAX_PATH);
- get_crashdump_path(wdir);
- FILE * fd = _wfopen ( wdir, L"w, ccs=UTF-8" );
- free((void *)wdir);
+ FILE * fd = _wfopen ( crashdump_path, L"w, ccs=UTF-8" );
if( !fd )
{
const CONTEXT *const pContext = (const CONTEXT *)lpExceptionInfo->ContextRecord;
const EXCEPTION_RECORD *const pException = (const EXCEPTION_RECORD *)lpExceptionInfo->ExceptionRecord;
/*No nested exceptions for now*/
- fwprintf( fd, L"\n\n[exceptions]\n%08x at %08x",pException->ExceptionCode,
+ fwprintf( fd, L"\n\n[exceptions]\n%08x at %px",pException->ExceptionCode,
pException->ExceptionAddress );
- if( pException->NumberParameters > 0 )
- {
- unsigned int i;
- for( i = 0; i < pException->NumberParameters; i++ )
- fwprintf( fd, L" | %08x", pException->ExceptionInformation[i] );
- }
- fwprintf( fd, L"\n\n[context]\nEDI:%08x\nESI:%08x\n" \
- "EBX:%08x\nEDX:%08x\nECX:%08x\nEAX:%08x\n" \
- "EBP:%08x\nEIP:%08x\nESP:%08x\n",
+ for( unsigned int i = 0; i < pException->NumberParameters; i++ )
+ fwprintf( fd, L" | %p", pException->ExceptionInformation[i] );
+
+#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" \
+ "R9:%px\nR10:%px\nR11:%px\nR12:%px\n" \
+ "R13:%px\nR14:%px\nR15:%px\n",
+ pContext->Rdi,pContext->Rsi,pContext->Rbx,
+ pContext->Rdx,pContext->Rcx,pContext->Rax,
+ pContext->Rbp,pContext->Rip,pContext->Rsp,
+ pContext->R8,pContext->R9,pContext->R10,
+ pContext->R11,pContext->R12,pContext->R13,
+ pContext->R14,pContext->R15 );
+#else
+ fwprintf( fd, L"\n\n[context]\nEDI:%px\nESI:%px\n" \
+ "EBX:%px\nEDX:%px\nECX:%px\nEAX:%px\n" \
+ "EBP:%px\nEIP:%px\nESP:%px\n",
pContext->Edi,pContext->Esi,pContext->Ebx,
pContext->Edx,pContext->Ecx,pContext->Eax,
pContext->Ebp,pContext->Eip,pContext->Esp );
+#endif
- fwprintf( fd, L"\n[stacktrace]\n#EIP|base|module\n" );
+ HANDLE hpid = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
+ FALSE, GetCurrentProcessId());
+ if (hpid) {
+ HMODULE mods[1024];
+ DWORD size;
+ if (EnumProcessModules(hpid, mods, sizeof(mods), &size)) {
+ fwprintf( fd, L"\n\n[modules]\n" );
+ for (unsigned int i = 0; i < size / sizeof(HMODULE); i++) {
+ wchar_t module[ 256 ];
+ GetModuleFileName(mods[i], module, 256);
+ fwprintf( fd, L"%p|%s\n", mods[i], module);
+ }
+ }
+ CloseHandle(hpid);
+ }
- wchar_t module[ 256 ];
- MEMORY_BASIC_INFORMATION mbi ;
- VirtualQuery( (DWORD *)pContext->Eip, &mbi, sizeof( mbi ) ) ;
- HINSTANCE hInstance = mbi.AllocationBase;
- GetModuleFileName( hInstance, module, 256 ) ;
- fwprintf( fd, L"%08x|%s\n", pContext->Eip, module );
- DWORD pEbp = pContext->Ebp;
- DWORD caller = *((DWORD*)pEbp + 1);
+ fwprintf( fd, L"\n[stacktrace]\n#EIP|base|module\n" );
- unsigned i_line = 0;
- do
+#ifdef WIN64
+ LPCVOID caller = (LPCVOID)pContext->Rip;
+ LPVOID *pBase = (LPVOID*)pContext->Rbp;
+#else
+ LPVOID *pBase = (LPVOID*)pContext->Ebp;
+ LPCVOID caller = (LPCVOID)pContext->Eip;
+#endif
+ for( unsigned frame = 0; frame <= 100; frame++ )
{
- VirtualQuery( (DWORD *)caller, &mbi, sizeof( mbi ) ) ;
- HINSTANCE hInstance = mbi.AllocationBase;
- GetModuleFileName( hInstance, module, 256 ) ;
- fwprintf( fd, L"%08x|%s\n", caller, module );
- pEbp = *(DWORD*)pEbp ;
- caller = *((DWORD*)pEbp + 1) ;
- i_line++;
- /*The last EBP points to NULL!*/
- }while(caller && i_line< 100);
+ MEMORY_BASIC_INFORMATION mbi;
+ wchar_t module[ 256 ];
+ VirtualQuery( caller, &mbi, sizeof( mbi ) ) ;
+ GetModuleFileName( mbi.AllocationBase, module, 256 );
+ fwprintf( fd, L"%p|%s\n", caller, module );
+
+ /*The last BP points to NULL!*/
+ caller = *(pBase + 1);
+ if( !caller )
+ break;
+ pBase = *pBase;
+ }
fclose( fd );
fflush( stderr );
projects / vlc / blobdiff