Get rid of version #ifdefs.

include/dinput.h

@@ -344,7 +344,6 @@ typedef struct DIDEVICEOBJECTINSTANCEA {
     DWORD	dwType;
     DWORD	dwFlags;
     CHAR	tszName[MAX_PATH];
-#if(DIRECTINPUT_VERSION >= 0x0500)
     DWORD	dwFFMaxForce;
     DWORD	dwFFForceResolution;
     WORD	wCollectionNumber;
@@ -354,7 +353,6 @@ typedef struct DIDEVICEOBJECTINSTANCEA {
     DWORD	dwDimension;
     WORD	wExponent;
     WORD	wReserved;
-#endif /* DIRECTINPUT_VERSION >= 0x0500 */
 } DIDEVICEOBJECTINSTANCEA, *LPDIDEVICEOBJECTINSTANCEA;
 typedef const DIDEVICEOBJECTINSTANCEA *LPCDIDEVICEOBJECTINSTANCEA;
 
@@ -365,7 +363,6 @@ typedef struct DIDEVICEOBJECTINSTANCEW {
     DWORD	dwType;
     DWORD	dwFlags;
     WCHAR	tszName[MAX_PATH];
-#if(DIRECTINPUT_VERSION >= 0x0500)
     DWORD	dwFFMaxForce;
     DWORD	dwFFForceResolution;
     WORD	wCollectionNumber;
@@ -375,7 +372,6 @@ typedef struct DIDEVICEOBJECTINSTANCEW {
     DWORD	dwDimension;
     WORD	wExponent;
     WORD	wReserved;
-#endif /* DIRECTINPUT_VERSION >= 0x0500 */
 } DIDEVICEOBJECTINSTANCEW, *LPDIDEVICEOBJECTINSTANCEW;
 typedef const DIDEVICEOBJECTINSTANCEW *LPCDIDEVICEOBJECTINSTANCEW;
 
@@ -413,11 +409,9 @@ typedef struct DIDEVICEINSTANCEA {
     DWORD	dwDevType;
     CHAR	tszInstanceName[MAX_PATH];
     CHAR	tszProductName[MAX_PATH];
-#if(DIRECTINPUT_VERSION >= 0x0500)
     GUID	guidFFDriver;
     WORD	wUsagePage;
     WORD	wUsage;
-#endif /* DIRECTINPUT_VERSION >= 0x0500 */
 } DIDEVICEINSTANCEA, *LPDIDEVICEINSTANCEA;
 typedef const DIDEVICEINSTANCEA *LPCDIDEVICEINSTANCEA;
 
@@ -428,11 +422,9 @@ typedef struct DIDEVICEINSTANCEW {
     DWORD	dwDevType;
     WCHAR	tszInstanceName[MAX_PATH];
     WCHAR	tszProductName[MAX_PATH];
-#if(DIRECTINPUT_VERSION >= 0x0500)
     GUID	guidFFDriver;
     WORD	wUsagePage;
     WORD	wUsage;
-#endif /* DIRECTINPUT_VERSION >= 0x0500 */
 } DIDEVICEINSTANCEW, *LPDIDEVICEINSTANCEW;
 typedef const DIDEVICEINSTANCEW *LPCDIDEVICEINSTANCEW;
 
@@ -444,11 +436,9 @@ typedef BOOL (CALLBACK *LPDIENUMDEVICESCALLBACKA)(LPCDIDEVICEINSTANCEA,LPVOID);
 typedef BOOL (CALLBACK *LPDIENUMDEVICESCALLBACKW)(LPCDIDEVICEINSTANCEW,LPVOID);
 DECL_WINELIB_TYPE_AW(LPDIENUMDEVICESCALLBACK)
 
-#if DIRECTINPUT_VERSION >= 0x0800
 typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBA)(LPCDIDEVICEINSTANCEA,LPDIRECTINPUTDEVICE8A,DWORD,DWORD,LPVOID);
 typedef BOOL (CALLBACK *LPDIENUMDEVICESBYSEMANTICSCBW)(LPCDIDEVICEINSTANCEW,LPDIRECTINPUTDEVICE8W,DWORD,DWORD,LPVOID);
 DECL_WINELIB_TYPE_AW(LPDIENUMDEVICESBYSEMANTICSCB)
-#endif
 
 typedef BOOL (CALLBACK *LPDICONFIGUREDEVICESCALLBACK)(LPUNKNOWN,LPVOID);
 
@@ -765,13 +755,11 @@ typedef struct DIDEVCAPS {
     DWORD	dwAxes;
     DWORD	dwButtons;
     DWORD	dwPOVs;
-#if(DIRECTINPUT_VERSION >= 0x0500)
     DWORD	dwFFSamplePeriod;
     DWORD	dwFFMinTimeResolution;
     DWORD	dwFirmwareRevision;
     DWORD	dwHardwareRevision;
     DWORD	dwFFDriverVersion;
-#endif /* DIRECTINPUT_VERSION >= 0x0500 */
 } DIDEVCAPS,*LPDIDEVCAPS;
 
 #define DIDC_ATTACHED		0x00000001
@@ -1038,7 +1026,6 @@ typedef const DIFILEEFFECT *LPCDIFILEEFFECT;
 typedef BOOL (CALLBACK *LPDIENUMEFFECTSINFILECALLBACK)(LPCDIFILEEFFECT , LPVOID);
 
 /* DInput 8 structures and types */
-#if DIRECTINPUT_VERSION >= 0x0800
 typedef struct _DIACTIONA {
 	UINT_PTR	uAppData;
 	DWORD		dwSemantics;
@@ -1258,8 +1245,6 @@ DECL_WINELIB_TYPE_AW(DIDEVICEIMAGEINFOHEADER)
 DECL_WINELIB_TYPE_AW(LPDIDEVICEIMAGEINFOHEADER)
 DECL_WINELIB_TYPE_AW(LPCDIDEVICEIMAGEINFOHEADER)
 
-#endif /* DI8 */
-
 
 /*****************************************************************************
  * IDirectInputEffect interface
@@ -1565,7 +1550,6 @@ DECLARE_INTERFACE_(IDirectInputDevice2W,IDirectInputDeviceW)
 #define IDirectInputDevice2_SendDeviceData(p,a,b,c,d)         (p)->SendDeviceData(a,b,c,d)
 #endif
 
-#if DIRECTINPUT_VERSION >= 0x0700
 /*****************************************************************************
  * IDirectInputDevice7A interface
  */
@@ -1720,9 +1704,7 @@ DECLARE_INTERFACE_(IDirectInputDevice7W,IDirectInputDevice2W)
 #define IDirectInputDevice7_WriteEffectToFile(p,a,b,c,d) (p)->WriteEffectToFile(a,b,c,d)
 #endif
 
-#endif /* DI7 */
 
-#if DIRECTINPUT_VERSION >= 0x0800
 /*****************************************************************************
  * IDirectInputDevice8A interface
  */
@@ -1893,8 +1875,6 @@ DECLARE_INTERFACE_(IDirectInputDevice8W,IDirectInputDevice7W)
 #define IDirectInputDevice8_GetImageInfo(p,a)       (p)->GetImageInfo(a)
 #endif
 
-#endif /* DI8 */
-
 /* "Standard" Mouse report... */
 typedef struct DIMOUSESTATE {
   LONG lX;
@@ -2067,7 +2047,6 @@ DECLARE_INTERFACE_(IDirectInput2W,IDirectInputW)
 #define IDirectInput2_FindDevice(p,a,b,c)    (p)->FindDevice(a,b,c)
 #endif
 
-#if DIRECTINPUT_VERSION >= 0x0700
 /*****************************************************************************
  * IDirectInput7A interface
  */
@@ -2146,9 +2125,7 @@ DECLARE_INTERFACE_(IDirectInput7W,IDirectInput2W)
 #define IDirectInput7_CreateDeviceEx(p,a,b,c,d) (p)->CreateDeviceEx(a,b,c,d)
 #endif
 
-#endif /* DI7 */
 
-#if DIRECTINPUT_VERSION >= 0x0800
 /*****************************************************************************
  * IDirectInput8A interface
  */
@@ -2223,7 +2200,6 @@ DECLARE_INTERFACE_(IDirectInput8W,IUnknown)
 #define IDirectInput8_ConfigureDevices(p,a,b,c,d) (p)->ConfigureDevices(a,b,c,d)
 #endif
 
-#endif /* DI8 */
 
 /* Export functions */
 
@@ -2231,9 +2207,7 @@ DECLARE_INTERFACE_(IDirectInput8W,IUnknown)
 extern "C" {
 #endif
 
-#if DIRECTINPUT_VERSION >= 0x0800
 HRESULT WINAPI DirectInput8Create(HINSTANCE,DWORD,REFIID,LPVOID *,LPUNKNOWN);
-#endif
 
 HRESULT WINAPI DirectInputCreateA(HINSTANCE,DWORD,LPDIRECTINPUTA *,LPUNKNOWN);
 HRESULT WINAPI DirectInputCreateW(HINSTANCE,DWORD,LPDIRECTINPUTW *,LPUNKNOWN);