[FFmpeg-cvslog] win32_dlfcn: Support WinRT/UWP.
Matt Oliver
git at videolan.org
Sun Jul 30 07:31:20 EEST 2017
ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Sat Jul 1 23:16:42 2017 +1000| [a3833bee9482fe650e05ee99718209414bd3356e] | committer: Matt Oliver
win32_dlfcn: Support WinRT/UWP.
This only enables dlls that are packaged with the application to be
loaded. Due to the limitations of WinRT/UWP it is not allowed to load
external/system dlls so this cannot be used as a complete replacement
for normal win32 dll loading.
Signed-off-by: Matt Oliver <protogonoi at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3833bee9482fe650e05ee99718209414bd3356e
---
compat/w32dlfcn.h | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/compat/w32dlfcn.h b/compat/w32dlfcn.h
index bc9bb8c9f5..78cc8f4c96 100644
--- a/compat/w32dlfcn.h
+++ b/compat/w32dlfcn.h
@@ -21,7 +21,7 @@
#ifdef _WIN32
#include <windows.h>
-#if _WIN32_WINNT < 0x0602
+#if (_WIN32_WINNT < 0x0602) || HAVE_WINRT
#include "libavutil/wchar_filename.h"
#endif
/**
@@ -71,7 +71,17 @@ exit:
#ifndef LOAD_LIBRARY_SEARCH_SYSTEM32
# define LOAD_LIBRARY_SEARCH_SYSTEM32 0x00000800
#endif
+#if HAVE_WINRT
+ wchar_t *name_w = NULL;
+ int ret;
+ if (utf8towchar(name, &name_w))
+ return NULL;
+ ret = LoadPackagedLibrary(name_w, 0);
+ av_free(name_w);
+ return ret;
+#else
return LoadLibraryExA(name, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32);
+#endif
}
#define dlopen(name, flags) win32_dlopen(name)
#define dlclose FreeLibrary
More information about the ffmpeg-cvslog
mailing list