X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2Fwinvlc.c;h=09f56b6e9629d637e277a1941ff7e7b36d30a37f;hb=09020b63ba7513eeaff38f1cc40e2b4937c61030;hp=874116035847621e195a4aae3262b5224efe6ac8;hpb=0851b345b93451a2cd0c61f12680b055fbfef027;p=vlc diff --git a/bin/winvlc.c b/bin/winvlc.c index 8741160358..09f56b6e96 100644 --- a/bin/winvlc.c +++ b/bin/winvlc.c @@ -123,7 +123,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, #endif int nCmdShow ) { - int argc, ret; + int argc; #ifndef UNDER_CE HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); wchar_t **wargv = CommandLineToArgvW (GetCommandLine (), &argc); @@ -169,12 +169,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, argc = parse_cmdline (psz_cmdline, &argv); #endif - libvlc_exception_t ex; - libvlc_exception_init (&ex); - /* Initialize libvlc */ libvlc_instance_t *vlc; - vlc = libvlc_new (argc, (const char **)argv, &ex); + vlc = libvlc_new (argc, (const char **)argv); if (vlc != NULL) { libvlc_add_intf (vlc, "globalhotkeys,none"); @@ -184,14 +181,11 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, libvlc_release (vlc); } - ret = libvlc_exception_raised (&ex); - libvlc_exception_clear (&ex); - for (int i = 0; i < argc; i++) free (argv[i]); (void)hInstance; (void)hPrevInstance; (void)lpCmdLine; (void)nCmdShow; - return ret; + return 0; } #if !defined( UNDER_CE ) && !defined( _WIN64 )