Fix warnings for no force feedback case.

This commit is contained in:
Mike McCormack 2005-09-07 11:25:32 +00:00 committed by Alexandre Julliard
parent c50ef541e8
commit b1eb3c30f3
1 changed files with 2 additions and 2 deletions

View File

@ -1198,6 +1198,7 @@ static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
LPVOID pvRef, LPVOID pvRef,
DWORD dwEffType) DWORD dwEffType)
{ {
#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
DIEFFECTINFOA dei; /* feif */ DIEFFECTINFOA dei; /* feif */
DWORD type = DIEFT_GETTYPE(dwEffType); DWORD type = DIEFT_GETTYPE(dwEffType);
JoystickImpl* This = (JoystickImpl*)iface; JoystickImpl* This = (JoystickImpl*)iface;
@ -1205,7 +1206,6 @@ static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd); TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd);
#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
dei.dwSize = sizeof(DIEFFECTINFOA); dei.dwSize = sizeof(DIEFFECTINFOA);
/* We need to return something even if we're not yet acquired */ /* We need to return something even if we're not yet acquired */
@ -1280,6 +1280,7 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
LPVOID pvRef, LPVOID pvRef,
DWORD dwEffType) DWORD dwEffType)
{ {
#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
/* seems silly to duplicate all this code but all the structures and functions /* seems silly to duplicate all this code but all the structures and functions
* are actually different (A/W) */ * are actually different (A/W) */
DIEFFECTINFOW dei; /* feif */ DIEFFECTINFOW dei; /* feif */
@ -1289,7 +1290,6 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd); TRACE("(this=%p,%p,%ld) type=%ld fd=%d\n", This, pvRef, dwEffType, type, xfd);
#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
dei.dwSize = sizeof(DIEFFECTINFOW); dei.dwSize = sizeof(DIEFFECTINFOW);
/* We need to return something even if we're not yet acquired */ /* We need to return something even if we're not yet acquired */