From 5e6943f4218a477a84988da0e3806a3a57c9f2a8 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Wed, 22 May 2002 01:55:18 +0000 Subject: [PATCH] Fixed some issues found by winapi_check. --- dlls/avifil32/avifile.c | 2 +- dlls/dinput/joystick/linux.c | 4 +++- dlls/dinput/joystick/linuxinput.c | 4 +++- dlls/shdocvw/shdocvw_main.c | 13 +++++++------ dlls/winedos/int31.c | 7 +++++-- dlls/winmm/wineoss/audio.c | 4 +++- dlls/winmm/wineoss/midi.c | 4 +++- dlls/winmm/wineoss/mixer.c | 5 ++++- dlls/winmm/wineoss/mmaux.c | 5 ++++- dlls/winsock/async.c | 4 +++- dlls/winsock/socket.c | 4 +++- dlls/wsock32/socket.c | 4 +++- dlls/x11drv/wineclipsrv.c | 4 +++- msdos/ppdev.c | 4 +++- 14 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index c04f2388fee..502727c9ba9 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -222,7 +222,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG /*********************************************************************** * AVIFileOpenA (AVIFIL32.@) - * AVIFileOpenA (AVIFILE.102) + * AVIFileOpen (AVIFILE.102) */ HRESULT WINAPI AVIFileOpenA( PAVIFILE * ppfile,LPCSTR szFile,UINT uMode,LPCLSID lpHandler diff --git a/dlls/dinput/joystick/linux.c b/dlls/dinput/joystick/linux.c index a58db60dd2f..6fad4dcace3 100644 --- a/dlls/dinput/joystick/linux.c +++ b/dlls/dinput/joystick/linux.c @@ -28,7 +28,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #include #ifdef HAVE_SYS_ERRNO_H # include diff --git a/dlls/dinput/joystick/linuxinput.c b/dlls/dinput/joystick/linuxinput.c index 4e9d40e056c..729dce3fd5d 100644 --- a/dlls/dinput/joystick/linuxinput.c +++ b/dlls/dinput/joystick/linuxinput.c @@ -29,7 +29,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #include #ifdef HAVE_SYS_ERRNO_H # include diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 614d6937fcf..318ce2155fc 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -30,7 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); /*********************************************************************** - * DllCanUnloadNow (SHDOCVW.109) */ + * DllCanUnloadNow (SHDOCVW.@) + */ HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) { FIXME("(void): stub\n"); @@ -39,7 +40,7 @@ HRESULT WINAPI SHDOCVW_DllCanUnloadNow(void) } /************************************************************************* - * DllGetClassObject (SHDOCVW.312) + * DllGetClassObject (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { @@ -58,7 +59,7 @@ HRESULT WINAPI SHDOCVW_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *p } /*********************************************************************** - * DllGetVersion (SHDOCVW.113) + * DllGetVersion (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi) { @@ -67,7 +68,7 @@ HRESULT WINAPI SHDOCVW_DllGetVersion (DLLVERSIONINFO *pdvi) } /************************************************************************* - * DllInstall (SHDOCVW.114) + * DllInstall (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline) { @@ -77,7 +78,7 @@ HRESULT WINAPI SHDOCVW_DllInstall(BOOL bInstall, LPCWSTR cmdline) } /*********************************************************************** - * DllRegisterServer (SHDOCVW.124) + * DllRegisterServer (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllRegisterServer() { @@ -86,7 +87,7 @@ HRESULT WINAPI SHDOCVW_DllRegisterServer() } /*********************************************************************** - * DllUnregisterServer (SHDOCVW.127) + * DllUnregisterServer (SHDOCVW.@) */ HRESULT WINAPI SHDOCVW_DllUnregisterServer() { diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index b085d756cf1..896c3bcce65 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -510,8 +510,11 @@ void WINAPI DPMI_FreeInternalRMCB( FARPROC16 proc ) } -/* DPMI Raw Mode Switch handler */ - +/********************************************************************** + * RawModeSwitch (WINEDOS.@) + * + * DPMI Raw Mode Switch handler + */ void WINAPI DOSVM_RawModeSwitch( CONTEXT86 *context ) { CONTEXT86 rm_ctx; diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 107ca6362bc..1db4fed6ebf 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -37,7 +37,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_MMAN_H # include #endif diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index cee7255448b..08dfb2e4ef8 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -31,7 +31,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #include "windef.h" #include "winbase.h" diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c index 8175a08e2af..194c901ada7 100644 --- a/dlls/winmm/wineoss/mixer.c +++ b/dlls/winmm/wineoss/mixer.c @@ -30,7 +30,10 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif + #include "windef.h" #include "mmddk.h" #include "oss.h" diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c index d280b429d11..6cbad782e1b 100644 --- a/dlls/winmm/wineoss/mmaux.c +++ b/dlls/winmm/wineoss/mmaux.c @@ -27,7 +27,10 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif + #include "windef.h" #include "mmddk.h" #include "oss.h" diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c index 0239f23e00d..50b282b1d34 100644 --- a/dlls/winsock/async.c +++ b/dlls/winsock/async.c @@ -41,7 +41,9 @@ #ifdef HAVE_SYS_IPC_H # include #endif -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_FILIO_H # include #endif diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index 44dfa6e3791..3b199958896 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -32,7 +32,9 @@ #ifdef HAVE_SYS_IPC_H # include #endif -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #ifdef HAVE_SYS_FILIO_H # include #endif diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index fe797c53dcb..79ffb521d95 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -49,7 +49,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #include #ifdef HAVE_SYS_SOCKET_H diff --git a/dlls/x11drv/wineclipsrv.c b/dlls/x11drv/wineclipsrv.c index e31c39d008b..f3d65f3cc17 100644 --- a/dlls/x11drv/wineclipsrv.c +++ b/dlls/x11drv/wineclipsrv.c @@ -833,7 +833,9 @@ void EVENT_ProcessEvent( XEvent *event ) break; case PropertyNotify: - // EVENT_PropertyNotify( (XPropertyEvent *)event ); +#if 0 + EVENT_PropertyNotify( (XPropertyEvent *)event ); +#endif break; default: /* ignore all other events */ diff --git a/msdos/ppdev.c b/msdos/ppdev.c index b413eb78d85..e7eec6623a4 100644 --- a/msdos/ppdev.c +++ b/msdos/ppdev.c @@ -26,7 +26,9 @@ #include #include #include -#include +#ifdef HAVE_SYS_IOCTL_H +# include +#endif #include #include