dinput: Make some functions static.

dlls/dinput/device.c

@@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 /******************************************************************************
  *	Various debugging tools
  */
-void _dump_cooperativelevel_DI(DWORD dwFlags) {
+static void _dump_cooperativelevel_DI(DWORD dwFlags) {
     if (TRACE_ON(dinput)) {
 	unsigned int   i;
 	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)) {
 	unsigned int   i;
 	DWORD type, instance;
@@ -342,13 +342,13 @@ void release_DataFormat(DataFormat * format)
     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;
     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;
     unsigned int i, j;
@@ -1132,26 +1132,6 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(
     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(
 	LPDIRECTINPUTDEVICE8A iface,
 	HWND hwndOwner,

dlls/dinput/device_private.h

@@ -77,7 +77,6 @@ extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD);
 
 /* Routines to do DataFormat / WineFormat conversions */
 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 queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq);
 /* 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;
 
 /* 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_OBJECTINSTANCEA(const DIDEVICEOBJECTINSTANCEA *ddoi) ;
 extern void _dump_OBJECTINSTANCEW(const DIDEVICEOBJECTINSTANCEW *ddoi) ;
@@ -165,12 +162,6 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo(LPDIRECTINPUTDEVICE
 							     DWORD dwHow);
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
         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(
 	LPDIRECTINPUTDEVICE8A iface,
 	HWND hwndOwner,