[Mplayer-cvslog] CVS: main/loader/DirectShow DS_Filter.cpp,1.3,1.4 DS_Filter.h,1.2,1.3

[GEREOFFY]

Update of /cvsroot/mplayer/main/loader/DirectShow
In directory usw-pr-cvs1:/tmp/cvs-serv16281

Modified Files:
	DS_Filter.cpp DS_Filter.h 
Log Message:
using expLoadLibraryA instead of LoadLibraryA

Index: DS_Filter.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_Filter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** DS_Filter.cpp	2001/04/11 01:38:57	1.3
--- DS_Filter.cpp	2001/04/11 02:11:39	1.4
***************
*** 12,16 ****
  extern "C" char* def_path;
  
! extern "C" int STDCALL LoadLibraryA(const char*);
  extern "C" STDCALL void* GetProcAddress(int, const char*);
  extern "C" int STDCALL FreeLibrary(int);
--- 12,17 ----
  extern "C" char* def_path;
  
! 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);
***************
*** 27,31 ****
  }
  
! void DS_Filter::Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt)
  {
  
--- 28,32 ----
  }
  
! void DS_Filter::Create(char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt)
  {
  
***************
*** 34,41 ****
      try
      {
! 	string _fullname=def_path;
! 	_fullname+="/";
! 	_fullname+=dllname;
! 	m_iHandle= LoadLibraryA(_fullname.c_str());
  	if(!m_iHandle)throw FATAL("Could not open DLL");
          GETCLASS func=(GETCLASS)GetProcAddress(m_iHandle, "DllGetClassObject");
--- 35,43 ----
      try
      {
! //	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");

Index: DS_Filter.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_Filter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DS_Filter.h	2001/04/07 16:59:36	1.2
--- DS_Filter.h	2001/04/11 02:11:39	1.3
***************
*** 17,21 ****
      DS_Filter();
      virtual ~DS_Filter();
!     void Create(string dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt);
      void Start();
      void Stop();
--- 17,21 ----
      DS_Filter();
      virtual ~DS_Filter();
!     void Create(char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt);
      void Start();
      void Stop();


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog