diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-11 02:11:39 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-11 02:11:39 +0000 |
commit | 7b946afcf60be4ef9a4d6f80bc9d3cf4c027622f (patch) | |
tree | 54c0c442c98026765b27e4ed7068e25e5cfaf770 /loader/dshow | |
parent | 9f33c6e1bc8c517ac3a2647f22400264de796e17 (diff) | |
download | mpv-7b946afcf60be4ef9a4d6f80bc9d3cf4c027622f.tar.bz2 mpv-7b946afcf60be4ef9a4d6f80bc9d3cf4c027622f.tar.xz |
using expLoadLibraryA instead of LoadLibraryA
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@343 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow')
-rw-r--r-- | loader/dshow/DS_Filter.c | 14 | ||||
-rw-r--r-- | loader/dshow/DS_Filter.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c index 483c3a539a..7d06473f9c 100644 --- a/loader/dshow/DS_Filter.c +++ b/loader/dshow/DS_Filter.c @@ -11,7 +11,8 @@ using namespace std; typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); extern "C" char* def_path; -extern "C" int STDCALL LoadLibraryA(const char*); +extern "C" int STDCALL expLoadLibraryA(const char*); +//extern "C" int WINAPI expLoadLibraryA(char* name); extern "C" STDCALL void* GetProcAddress(int, const char*); extern "C" int STDCALL FreeLibrary(int); @@ -26,17 +27,18 @@ DS_Filter::DS_Filter() { } -void DS_Filter::Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt) +void DS_Filter::Create(char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt) { Setup_LDT_Keeper(); try { - string _fullname=def_path; - _fullname+="/"; - _fullname+=dllname; - m_iHandle= LoadLibraryA(_fullname.c_str()); +// string _fullname=def_path; +// _fullname+="/"; +// _fullname+=dllname; +// m_iHandle= LoadLibraryA(_fullname.c_str()); + m_iHandle= expLoadLibraryA(dllname); if(!m_iHandle)throw FATAL("Could not open DLL"); GETCLASS func=(GETCLASS)GetProcAddress(m_iHandle, "DllGetClassObject"); if(!func)throw FATAL("Illegal or corrupt DLL"); diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h index c2b2cd3a0e..c4aab0d12c 100644 --- a/loader/dshow/DS_Filter.h +++ b/loader/dshow/DS_Filter.h @@ -16,7 +16,7 @@ protected: public: DS_Filter(); virtual ~DS_Filter(); - void Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt); + void Create(char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt); void Start(); void Stop(); int m_iHandle; |