Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
3bc1263e
Commit
3bc1263e
authored
Sep 30, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
Sep 30, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput8/tests: Don't try running more tests after a win_skip.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d3446e1f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
8 deletions
+13
-8
hid.c
dlls/dinput8/tests/hid.c
+13
-8
No files found.
dlls/dinput8/tests/hid.c
View file @
3bc1263e
...
...
@@ -4593,7 +4593,7 @@ struct device_desc
HIDP_CAPS
hid_caps
;
};
static
void
test_device_types
(
void
)
static
BOOL
test_device_types
(
void
)
{
#include "psh_hid_macros.h"
static
const
unsigned
char
unknown_desc
[]
=
...
...
@@ -4837,11 +4837,12 @@ static void test_device_types( void )
DIDEVCAPS
caps
=
{.
dwSize
=
sizeof
(
DIDEVCAPS
)};
WCHAR
cwd
[
MAX_PATH
],
tempdir
[
MAX_PATH
];
IDirectInputDevice8W
*
device
;
BOOL
success
=
TRUE
;
IDirectInput8W
*
di
;
ULONG
i
,
ref
;
HRESULT
hr
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
device_desc
);
++
i
)
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
device_desc
)
&&
success
;
++
i
)
{
winetest_push_context
(
"desc[%d]"
,
i
);
GetCurrentDirectoryW
(
ARRAY_SIZE
(
cwd
),
cwd
);
...
...
@@ -4852,7 +4853,7 @@ static void test_device_types( void )
if
(
!
dinput_driver_start
(
device_desc
[
i
].
report_desc_buf
,
device_desc
[
i
].
report_desc_len
,
&
device_desc
[
i
].
hid_caps
))
{
i
=
ARRAY_SIZE
(
device_desc
)
;
success
=
FALSE
;
goto
done
;
}
...
...
@@ -4860,7 +4861,7 @@ static void test_device_types( void )
if
(
FAILED
(
hr
))
{
win_skip
(
"DirectInput8Create returned %#x
\n
"
,
hr
);
i
=
ARRAY_SIZE
(
device_desc
)
;
success
=
FALSE
;
goto
done
;
}
...
...
@@ -4870,7 +4871,7 @@ static void test_device_types( void )
{
win_skip
(
"device not found, skipping tests
\n
"
);
IDirectInput8_Release
(
di
);
i
=
ARRAY_SIZE
(
device_desc
)
;
success
=
FALSE
;
goto
done
;
}
...
...
@@ -4918,6 +4919,8 @@ static void test_device_types( void )
SetCurrentDirectoryW
(
cwd
);
winetest_pop_context
();
}
return
success
;
}
static
void
test_force_feedback_joystick
(
void
)
...
...
@@ -5345,9 +5348,11 @@ START_TEST( hid )
test_hid_driver
(
1
,
TRUE
);
CoInitialize
(
NULL
);
test_device_types
();
test_simple_joystick
();
test_force_feedback_joystick
();
if
(
test_device_types
())
{
test_simple_joystick
();
test_force_feedback_joystick
();
}
CoUninitialize
();
UnmapViewOfFile
(
test_data
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment