vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Jul 1 13:42:20 2016 +0200| [24c12339c4576006764224b25115996cdb7afe8b] | committer: Jean-Baptiste Kempf
Win32: simplify WinRT LoadLibrary handling > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24c12339c4576006764224b25115996cdb7afe8b --- src/win32/plugin.c | 7 +++---- src/win32/specific.c | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/win32/plugin.c b/src/win32/plugin.c index 8dd30eb..02d6446 100644 --- a/src/win32/plugin.c +++ b/src/win32/plugin.c @@ -105,15 +105,14 @@ int module_Load( vlc_object_t *p_this, const char *psz_file, module_handle_t handle = NULL; #if !VLC_WINSTORE_APP DWORD mode; - if (SetThreadErrorMode (SEM_FAILCRITICALERRORS, &mode) != 0) -#endif { handle = LoadLibraryExW (wfile, NULL, LoadLibraryFlags ); -#if !VLC_WINSTORE_APP SetThreadErrorMode (mode, NULL); -#endif } +#else + LoadPackagedLibrary( wfile ) +#endif free (wfile); if( handle == NULL ) diff --git a/src/win32/specific.c b/src/win32/specific.c index fd1a21d..ca42094 100644 --- a/src/win32/specific.c +++ b/src/win32/specific.c @@ -72,9 +72,6 @@ void system_Init(void) LoadLibraryFlags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; } -#else - LoadLibraryFlags = LOAD_LIBRARY_SEARCH_APPLICATION_DIR | - LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR; #endif } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
