Fix some compiler warnings.

CVS patchset: 1399
CVS date: 2002/01/13 21:55:39

7 files changed, 33 insertions, 8 deletions

diff --git a/src/libw32dll/DirectShow/allocator.h b/src/libw32dll/DirectShow/allocator.h
index 855637063..c8c62b2fc 100644
--- a/src/libw32dll/DirectShow/allocator.h
+++ b/src/libw32dll/DirectShow/allocator.h
@@ -27,6 +27,7 @@ struct _MemAllocator
     void ( *ResetPointer )(MemAllocator* This);
 };
 
-MemAllocator* MemAllocatorCreate();
+MemAllocator* MemAllocatorCreate(void);
+void MemAllocator_Destroy(MemAllocator* This);
 
 #endif /* DS_ALLOCATOR_H */
diff --git a/src/libw32dll/DirectShow/inputpin.h b/src/libw32dll/DirectShow/inputpin.h
index 1ad9a2d60..14c0992d6 100644
--- a/src/libw32dll/DirectShow/inputpin.h
+++ b/src/libw32dll/DirectShow/inputpin.h
@@ -14,7 +14,7 @@ struct _CBaseFilter2
     IPin* ( *GetPin )(CBaseFilter2* This);
 };
 
-CBaseFilter2* CBaseFilter2Create();
+CBaseFilter2* CBaseFilter2Create(void);
 
 
 typedef struct _CBaseFilter CBaseFilter;
diff --git a/src/libw32dll/DirectShow/outputpin.c b/src/libw32dll/DirectShow/outputpin.c
index 4546d0294..bfdf5c027 100644
--- a/src/libw32dll/DirectShow/outputpin.c
+++ b/src/libw32dll/DirectShow/outputpin.c
@@ -16,6 +16,8 @@ static int unimplemented(const char* s, void* p)
     return E_NOTIMPL;
 }
 
+/* In outputpin.h now *********
+******************************
 typedef struct CEnumMediaTypes
 {
     IEnumMediaTypes_vt* vt;
@@ -23,7 +25,7 @@ typedef struct CEnumMediaTypes
     AM_MEDIA_TYPE type;
     GUID interfaces[2];
 } CEnumMediaTypes;
-
+********************/
 
 static HRESULT STDCALL CEnumMediaTypes_Next(IEnumMediaTypes * This,
 					    /* [in] */ ULONG cMediaTypes,
diff --git a/src/libw32dll/DirectShow/outputpin.h b/src/libw32dll/DirectShow/outputpin.h
index 016b36787..f95295e59 100644
--- a/src/libw32dll/DirectShow/outputpin.h
+++ b/src/libw32dll/DirectShow/outputpin.h
@@ -33,4 +33,18 @@ struct _COutputPin
 
 COutputPin* COutputPinCreate(const AM_MEDIA_TYPE* vhdr);
 
+typedef struct _CEnumMediaTypes  CEnumMediaTypes;
+
+struct _CEnumMediaTypes
+{
+    IEnumMediaTypes_vt* vt;
+    DECLARE_IUNKNOWN();
+    AM_MEDIA_TYPE type;
+    GUID interfaces[2];
+} ;
+
+
+void CEnumMediaTypes_Destroy(CEnumMediaTypes* This);
+CEnumMediaTypes* CEnumMediaTypesCreate(const AM_MEDIA_TYPE* amt);
+
 #endif /* DS_OUTPUTPIN_H */
diff --git a/src/libw32dll/wine/module.c b/src/libw32dll/wine/module.c
index aa15c8139..1091db9f9 100644
--- a/src/libw32dll/wine/module.c
+++ b/src/libw32dll/wine/module.c
@@ -27,7 +27,7 @@
 #include <wine/elfdll.h>
 #endif
 #include "win32.h"
-//#include "driver.h"
+#include "driver.h"
 
 //#undef TRACE
 //#define TRACE printf
diff --git a/src/libw32dll/wine/module.h b/src/libw32dll/wine/module.h
index 7237c95f0..4dc0c2b36 100644
--- a/src/libw32dll/wine/module.h
+++ b/src/libw32dll/wine/module.h
@@ -133,12 +133,16 @@ typedef struct resource_nameinfo_s NE_NAMEINFO;
 /* module.c */
 extern FARPROC MODULE_GetProcAddress( HMODULE hModule, LPCSTR function, WIN_BOOL snoop );
 extern WINE_MODREF *MODULE32_LookupHMODULE( HMODULE hModule );
-extern WIN_BOOL MODULE_DllProcessAttach( WINE_MODREF *wm, LPVOID lpReserved );
-extern void MODULE_DllProcessDetach( WINE_MODREF *wm, WIN_BOOL bForceDetach, LPVOID lpReserved );
+/* This is static */
+/* extern WIN_BOOL MODULE_DllProcessAttach( WINE_MODREF *wm, LPVOID lpReserved ); */
+/* This is static */
+/* extern void MODULE_DllProcessDetach( WINE_MODREF *wm, WIN_BOOL bForceDetach, LPVOID lpReserved ); */
 extern void MODULE_DllThreadAttach( LPVOID lpReserved );
 extern void MODULE_DllThreadDetach( LPVOID lpReserved );
-extern WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags );
-extern WIN_BOOL MODULE_FreeLibrary( WINE_MODREF *wm );
+/* This is static */
+/* extern WINE_MODREF *MODULE_LoadLibraryExA( LPCSTR libname, HFILE hfile, DWORD flags ); */
+/* This is static */
+/* extern WIN_BOOL MODULE_FreeLibrary( WINE_MODREF *wm ); */
 extern WINE_MODREF *MODULE_FindModule( LPCSTR path );
 extern HMODULE MODULE_CreateDummyModule( LPCSTR filename, HMODULE module32 );
 extern FARPROC16 WINAPI WIN32_GetProcAddress16( HMODULE hmodule, LPCSTR name );
diff --git a/src/libw32dll/wine/vfw.h b/src/libw32dll/wine/vfw.h
index 3eba74e08..0a9e1ce1e 100644
--- a/src/libw32dll/wine/vfw.h
+++ b/src/libw32dll/wine/vfw.h
@@ -382,6 +382,10 @@ typedef struct {
 
 long VFWAPIV ICDecompress(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER lpbi,void* lpBits);
 
+long VFWAPIV ICDecompressEx(HIC hic,long dwFlags,LPBITMAPINFOHEADER lpbiFormat,void* lpData,LPBITMAPINFOHEADER  lpbi,void* lpBits);
+
+long VFWAPIV ICUniversalEx(HIC hic,int command,LPBITMAPINFOHEADER lpbiFormat,LPBITMAPINFOHEADER lpbi);
+
 
 #define ICDecompressBegin(hic, lpbiInput, lpbiOutput) 	\
     ICSendMessage(						\