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

dinput: Explicitly check for -1 as open() failure code. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-08-23 00:22:15 +03:00 committed by Alexandre Julliard
parent 3b3c0d9e09
commit 3605cde8ea
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/dinput/joystick_linux.c
View File

@ -150,8 +150,7 @@ static BOOL read_sys_id_variable(int index, const char *property, WORD *value)
BOOL ret = FALSE; BOOL ret = FALSE;
sprintf(sys_path, SYS_PATH_FORMAT, index, property); sprintf(sys_path, SYS_PATH_FORMAT, index, property);
sys_fd = open(sys_path, O_RDONLY); if ((sys_fd = open(sys_path, O_RDONLY)) != -1)
if (sys_fd > 0)
{ {
if (read(sys_fd, id_str, 4) == 4) if (read(sys_fd, id_str, 4) == 4)
{ {
@ -180,10 +179,10 @@ static INT find_joystick_devices(void)
BYTE axes_map[ABS_MAX + 1]; BYTE axes_map[ABS_MAX + 1];
snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i);
if ((fd = open(joydev.device, O_RDONLY)) < 0) if ((fd = open(joydev.device, O_RDONLY)) == -1)
{ {
snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_OLD, i); snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_OLD, i);
if ((fd = open(joydev.device, O_RDONLY)) < 0) continue; if ((fd = open(joydev.device, O_RDONLY)) == -1) continue;
} }
strcpy(joydev.name, "Wine Joystick"); strcpy(joydev.name, "Wine Joystick");
@ -355,7 +354,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS
((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) ||
(((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) {
/* check whether we have a joystick */ /* check whether we have a joystick */
if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1)
{ {
WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno));
return S_FALSE; return S_FALSE;
@ -384,7 +383,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS
((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) ||
(((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) {
/* check whether we have a joystick */ /* check whether we have a joystick */
if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1)
{ {
WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno));
return S_FALSE; return S_FALSE;