dinput: Make some functions static.

This commit is contained in:
Alexandre Julliard 2008-12-03 12:13:37 +01:00
parent 1a882843bf
commit 9ef1f0fe2e
2 changed files with 4 additions and 33 deletions

View File

@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
/****************************************************************************** /******************************************************************************
* Various debugging tools * Various debugging tools
*/ */
void _dump_cooperativelevel_DI(DWORD dwFlags) { static void _dump_cooperativelevel_DI(DWORD dwFlags) {
if (TRACE_ON(dinput)) { if (TRACE_ON(dinput)) {
unsigned int i; unsigned int i;
static const struct { static const struct {
@ -67,7 +67,7 @@ void _dump_cooperativelevel_DI(DWORD dwFlags) {
} }
} }
void _dump_EnumObjects_flags(DWORD dwFlags) { static void _dump_EnumObjects_flags(DWORD dwFlags) {
if (TRACE_ON(dinput)) { if (TRACE_ON(dinput)) {
unsigned int i; unsigned int i;
DWORD type, instance; DWORD type, instance;
@ -342,13 +342,13 @@ void release_DataFormat(DataFormat * format)
format->user_df = NULL; format->user_df = NULL;
} }
inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) static inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx)
{ {
if (idx < 0 || idx >= df->dwNumObjs) return NULL; if (idx < 0 || idx >= df->dwNumObjs) return NULL;
return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize);
} }
HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format) static HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format)
{ {
DataTransform *dt; DataTransform *dt;
unsigned int i, j; unsigned int i, j;
@ -1132,26 +1132,6 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(
return ret; return ret;
} }
HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi)
{
FIXME("(this=%p,%p): stub!\n",
iface, pdidi);
return DI_OK;
}
HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8W iface,
LPDIDEVICEINSTANCEW pdidi)
{
FIXME("(this=%p,%p): stub!\n",
iface, pdidi);
return DI_OK;
}
HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
LPDIRECTINPUTDEVICE8A iface, LPDIRECTINPUTDEVICE8A iface,
HWND hwndOwner, HWND hwndOwner,

View File

@ -77,7 +77,6 @@ extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD);
/* Routines to do DataFormat / WineFormat conversions */ /* Routines to do DataFormat / WineFormat conversions */
extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) ; extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) ;
extern HRESULT create_DataFormat(LPCDIDATAFORMAT asked_format, DataFormat *format);
extern void release_DataFormat(DataFormat *df) ; extern void release_DataFormat(DataFormat *df) ;
extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq);
/* Helper functions to work with data format */ /* Helper functions to work with data format */
@ -120,8 +119,6 @@ extern const GUID DInput_Wine_Keyboard_GUID;
extern const GUID DInput_Wine_Mouse_GUID; extern const GUID DInput_Wine_Mouse_GUID;
/* Various debug tools */ /* Various debug tools */
extern void _dump_cooperativelevel_DI(DWORD dwFlags) ;
extern void _dump_EnumObjects_flags(DWORD dwFlags) ;
extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) ; extern void _dump_DIPROPHEADER(LPCDIPROPHEADER diph) ;
extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) ; extern void _dump_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) ;
extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) ; extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) ;
@ -165,12 +162,6 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(LPDIRECTINPUTDEVICE
DWORD dwHow); DWORD dwHow);
extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface, extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags); DWORD dodsize, LPDIDEVICEOBJECTDATA dod, LPDWORD entries, DWORD flags);
extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8A iface,
LPDIDEVICEINSTANCEA pdidi) ;
extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo(
LPDIRECTINPUTDEVICE8W iface,
LPDIDEVICEINSTANCEW pdidi) ;
extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel( extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
LPDIRECTINPUTDEVICE8A iface, LPDIRECTINPUTDEVICE8A iface,
HWND hwndOwner, HWND hwndOwner,