From 4c7ea33cb24a219650af6c2a27834f75135ced36 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Sun, 13 Jan 2002 21:55:39 +0000 Subject: Fix some compiler warnings. CVS patchset: 1399 CVS date: 2002/01/13 21:55:39 --- src/libw32dll/wine/module.c | 2 +- src/libw32dll/wine/module.h | 12 ++++++++---- src/libw32dll/wine/vfw.h | 4 ++++ 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src/libw32dll/wine') 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 #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( \ -- cgit v1.2.3