Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-fonts
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
Aleksandr Isakov
wine-fonts
Commits
d4ea5f98
Commit
d4ea5f98
authored
Jun 02, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Jun 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Fix DIPROP_FFGAIN mouse and keyboard tests.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
parent
6a95003b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
device.c
dlls/dinput/device.c
+1
-1
device8.c
dlls/dinput/tests/device8.c
+8
-8
No files found.
dlls/dinput/device.c
View file @
d4ea5f98
...
...
@@ -1394,9 +1394,9 @@ static HRESULT WINAPI dinput_device_set_property( IDirectInputDevice8W *iface, c
case
(
DWORD_PTR
)
DIPROP_FFGAIN
:
{
const
DIPROPDWORD
*
value
=
(
const
DIPROPDWORD
*
)
header
;
if
(
!
impl
->
vtbl
->
send_device_gain
)
return
DIERR_UNSUPPORTED
;
impl
->
device_gain
=
value
->
dwData
;
if
(
!
is_exclusively_acquired
(
impl
))
return
DI_OK
;
if
(
!
impl
->
vtbl
->
send_device_gain
)
return
DI_OK
;
return
impl
->
vtbl
->
send_device_gain
(
iface
,
impl
->
device_gain
);
}
case
(
DWORD_PTR
)
DIPROP_AXISMODE
:
...
...
dlls/dinput/tests/device8.c
View file @
d4ea5f98
...
...
@@ -1745,14 +1745,14 @@ static void test_mouse_info(void)
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_KEYNAME
,
&
prop_string
.
diph
);
ok
(
hr
==
DIERR_UNSUPPORTED
,
"GetProperty DIPROP_KEYNAME returned %#lx
\n
"
,
hr
);
prop_
range
.
diph
.
dwHow
=
DIPH_DEVICE
;
prop_
range
.
diph
.
dwObj
=
0
;
prop_
dword
.
diph
.
dwHow
=
DIPH_DEVICE
;
prop_
dword
.
diph
.
dwObj
=
0
;
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_SetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
ok
(
hr
==
DIERR_
UNSUPPORTED
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
ok
(
hr
==
DIERR_
INVALIDPARAM
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
prop_dword
.
dwData
=
1000
;
hr
=
IDirectInputDevice8_SetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
ok
(
hr
==
DI
ERR_UNSUPPORTED
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
ok
(
hr
==
DI
_OK
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
res
=
0
;
hr
=
IDirectInputDevice8_EnumObjects
(
device
,
check_object_count
,
&
res
,
DIDFT_AXIS
|
DIDFT_PSHBUTTON
);
...
...
@@ -2080,14 +2080,14 @@ static void test_keyboard_info(void)
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_RANGE
,
&
prop_range
.
diph
);
ok
(
hr
==
DIERR_UNSUPPORTED
,
"GetProperty DIPROP_RANGE returned %#lx
\n
"
,
hr
);
prop_
range
.
diph
.
dwHow
=
DIPH_DEVICE
;
prop_
range
.
diph
.
dwObj
=
0
;
prop_
dword
.
diph
.
dwHow
=
DIPH_DEVICE
;
prop_
dword
.
diph
.
dwObj
=
0
;
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_SetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
ok
(
hr
==
DIERR_
UNSUPPORTED
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
ok
(
hr
==
DIERR_
INVALIDPARAM
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
prop_dword
.
dwData
=
1000
;
hr
=
IDirectInputDevice8_SetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
ok
(
hr
==
DI
ERR_UNSUPPORTED
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
ok
(
hr
==
DI
_OK
,
"SetProperty DIPROP_FFGAIN returned %#lx
\n
"
,
hr
);
res
=
0
;
hr
=
IDirectInputDevice8_EnumObjects
(
device
,
check_object_count
,
&
res
,
DIDFT_AXIS
|
DIDFT_PSHBUTTON
);
...
...
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