X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fwinvlc.c;h=3ac028af73f03e2dfba2307851e9b2c65f221411;hb=5450e850793374c18e25ccc4e63660f110d61ce4;hp=a8dd08aa79be09d19dcb3933d75dd6fc26bdfe9a;hpb=f5c2514a7a64f8d96b1365802210e3b493f30b51;p=vlc

diff --git a/bin/winvlc.c b/bin/winvlc.c
index a8dd08aa79..3ac028af73 100644
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -36,12 +36,16 @@
 #include <windows.h>
 
 #if !defined(UNDER_CE)
-#   define  _WIN32_IE 0x500
+# ifndef _WIN32_IE
+#   define  _WIN32_IE 0x501
+# endif
 #   include <shlobj.h>
 #   include <tlhelp32.h>
 #   include <wininet.h>
-static void check_crashdump();
+# ifndef _WIN64
+static void check_crashdump(void);
 LONG WINAPI vlc_exception_filter(struct _EXCEPTION_POINTERS *lpExceptionInfo);
+# endif
 #endif
 
 #ifndef UNDER_CE
@@ -122,7 +126,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     char *argv[argc + 1];
     BOOL crash_handling = TRUE;
     int j = 0;
-    for (int i = 0; i < argc; i++)
+
+    argv[j++] = FromWide( L"--no-ignore-config" );
+    for (int i = 1; i < argc; i++)
     {
         if(!wcscmp(wargv[i], L"--no-crashdump"))
         {
@@ -139,11 +145,13 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     argv[argc] = NULL;
     LocalFree (wargv);
 
+# ifndef _WIN64
     if(crash_handling)
     {
         check_crashdump();
         SetUnhandledExceptionFilter(vlc_exception_filter);
     }
+# endif /* WIN64 */
 
 #else
     char **argv, psz_cmdline[wcslen(lpCmdLine) * 4];
@@ -160,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
 
     /* Initialize libvlc */
     libvlc_instance_t *vlc;
-    vlc = libvlc_new (argc - 1, (const char **)argv + 1, &ex);
+    vlc = libvlc_new (argc, (const char **)argv, &ex);
     if (vlc != NULL)
     {
         libvlc_add_intf (vlc, "globalhotkeys,none", &ex);
@@ -181,7 +189,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     return ret;
 }
 
-#if !defined( UNDER_CE )
+#if !defined( UNDER_CE ) && !defined( _WIN64 )
 
 static void get_crashdump_path(wchar_t * wdir)
 {