ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Be more precise when returning effect upload errors. 

Based on ideas by Elias Vanderstuyft.

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Bruno Jesus 2016-08-22 22:06:56 -03:00 committed by Alexandre Julliard
parent c7e6b4fbec
commit 844a25ab38
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/dinput/effect_linuxinput.c
View File

@ -173,20 +173,32 @@ static HRESULT WINAPI LinuxInputEffectImpl_Download(
LPDIRECTINPUTEFFECT iface) LPDIRECTINPUTEFFECT iface)
{ {
LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface);
int ret;
TRACE("(this=%p)\n", This); TRACE("(this=%p)\n", This);
ff_dump_effect(&This->effect); ff_dump_effect(&This->effect);
if (ioctl(*(This->fd), EVIOCSFF, &This->effect) == -1) { if (ioctl(*(This->fd), EVIOCSFF, &This->effect) != -1)
if (errno == ENOMEM) {
return DIERR_DEVICEFULL;
} else {
FIXME("Could not upload effect. Assuming a disconnected device %d \"%s\".\n", *This->fd, strerror(errno));
return DIERR_INPUTLOST;
}
}
return DI_OK; return DI_OK;
switch (errno)
{
case EINVAL:
ret = DIERR_INVALIDPARAM;
break;
case ENOSPC:
ret = DIERR_DEVICEFULL;
break;
case ENOMEM:
ret = DIERR_OUTOFMEMORY;
break;
default:
ret = DIERR_INPUTLOST;
break;
}
TRACE("Could not upload effect to fd %d, errno %d \"%s\", returning 0x%x.\n",
*This->fd, errno, strerror(errno), ret);
return ret;
} }
static HRESULT WINAPI LinuxInputEffectImpl_Escape( static HRESULT WINAPI LinuxInputEffectImpl_Escape(