Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
7402568a
Commit
7402568a
authored
Oct 19, 2021
by
Rémi Bernon
Committed by
Alexandre Julliard
Oct 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Implement GetProperty with DIPROP_FFGAIN stub.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3ec4ae83
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
device.c
dlls/dinput/device.c
+7
-0
device.c
dlls/dinput8/tests/device.c
+0
-4
hid.c
dlls/dinput8/tests/hid.c
+0
-4
No files found.
dlls/dinput/device.c
View file @
7402568a
...
...
@@ -1280,6 +1280,13 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty( IDirectInputDevice8W *iface
}
return
S_FALSE
;
}
case
(
DWORD_PTR
)
DIPROP_FFGAIN
:
{
DIPROPDWORD
*
value
=
(
DIPROPDWORD
*
)
header
;
if
(
header
->
dwSize
!=
sizeof
(
DIPROPDWORD
))
return
DIERR_INVALIDPARAM
;
value
->
dwData
=
10000
;
return
DI_OK
;
}
case
(
DWORD_PTR
)
DIPROP_CALIBRATION
:
return
DIERR_INVALIDPARAM
;
default:
...
...
dlls/dinput8/tests/device.c
View file @
7402568a
...
...
@@ -1315,9 +1315,7 @@ static void test_mouse_info(void)
ok
(
prop_dword
.
dwData
==
0
,
"got %#x expected %#x
\n
"
,
prop_dword
.
dwData
,
0
);
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
todo_wine
ok
(
hr
==
DI_OK
,
"GetProperty DIPROP_FFGAIN returned %#x
\n
"
,
hr
);
todo_wine
ok
(
prop_dword
.
dwData
==
10000
,
"got %u expected %u
\n
"
,
prop_dword
.
dwData
,
10000
);
hr
=
IDirectInputDevice8_SetDataFormat
(
device
,
&
c_dfDIMouse2
);
...
...
@@ -1638,9 +1636,7 @@ static void test_keyboard_info(void)
ok
(
prop_dword
.
dwData
==
0
,
"got %#x expected %#x
\n
"
,
prop_dword
.
dwData
,
0
);
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
todo_wine
ok
(
hr
==
DI_OK
,
"GetProperty DIPROP_FFGAIN returned %#x
\n
"
,
hr
);
todo_wine
ok
(
prop_dword
.
dwData
==
10000
,
"got %u expected %u
\n
"
,
prop_dword
.
dwData
,
10000
);
hr
=
IDirectInputDevice8_SetDataFormat
(
device
,
&
c_dfDIKeyboard
);
...
...
dlls/dinput8/tests/hid.c
View file @
7402568a
...
...
@@ -3992,9 +3992,7 @@ static void test_simple_joystick(void)
ok
(
prop_dword
.
dwData
==
0
,
"got %#x expected %#x
\n
"
,
prop_dword
.
dwData
,
0
);
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
todo_wine
ok
(
hr
==
DI_OK
,
"GetProperty DIPROP_FFGAIN returned %#x
\n
"
,
hr
);
todo_wine
ok
(
prop_dword
.
dwData
==
10000
,
"got %u expected %u
\n
"
,
prop_dword
.
dwData
,
10000
);
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_CALIBRATION
,
&
prop_dword
.
diph
);
...
...
@@ -7143,9 +7141,7 @@ static void test_force_feedback_joystick( void )
prop_dword
.
dwData
=
0xdeadbeef
;
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_FFGAIN
,
&
prop_dword
.
diph
);
todo_wine
ok
(
hr
==
DI_OK
,
"GetProperty DIPROP_FFGAIN returned %#x
\n
"
,
hr
);
todo_wine
ok
(
prop_dword
.
dwData
==
10000
,
"got %u expected %u
\n
"
,
prop_dword
.
dwData
,
10000
);
hr
=
IDirectInputDevice8_GetProperty
(
device
,
DIPROP_FFLOAD
,
&
prop_dword
.
diph
);
...
...
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