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
b7f51783
Commit
b7f51783
authored
Apr 29, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
May 19, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
windows.gaming.input: Implement IForceFeedbackEffect_get_State.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b2b1e6a4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
force_feedback.c
dlls/dinput/tests/force_feedback.c
+0
-4
force_feedback.c
dlls/windows.gaming.input/force_feedback.c
+19
-2
No files found.
dlls/dinput/tests/force_feedback.c
View file @
b7f51783
...
@@ -6020,9 +6020,7 @@ static void test_windows_gaming_input(void)
...
@@ -6020,9 +6020,7 @@ static void test_windows_gaming_input(void)
ok
(
hr
==
S_FALSE
,
"put_Gain returned %#lx
\n
"
,
hr
);
ok
(
hr
==
S_FALSE
,
"put_Gain returned %#lx
\n
"
,
hr
);
state
=
0xdeadbeef
;
state
=
0xdeadbeef
;
hr
=
IForceFeedbackEffect_get_State
(
effect
,
&
state
);
hr
=
IForceFeedbackEffect_get_State
(
effect
,
&
state
);
todo_wine
ok
(
hr
==
S_OK
,
"get_State returned %#lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"get_State returned %#lx
\n
"
,
hr
);
todo_wine
ok
(
state
==
ForceFeedbackEffectState_Stopped
,
"got state %#x
\n
"
,
state
);
ok
(
state
==
ForceFeedbackEffectState_Stopped
,
"got state %#x
\n
"
,
state
);
hr
=
IForceFeedbackEffect_Start
(
effect
);
hr
=
IForceFeedbackEffect_Start
(
effect
);
todo_wine
todo_wine
...
@@ -6260,9 +6258,7 @@ static void test_windows_gaming_input(void)
...
@@ -6260,9 +6258,7 @@ static void test_windows_gaming_input(void)
ok
(
hr
==
S_FALSE
,
"put_Gain returned %#lx
\n
"
,
hr
);
ok
(
hr
==
S_FALSE
,
"put_Gain returned %#lx
\n
"
,
hr
);
state
=
0xdeadbeef
;
state
=
0xdeadbeef
;
hr
=
IForceFeedbackEffect_get_State
(
effect
,
&
state
);
hr
=
IForceFeedbackEffect_get_State
(
effect
,
&
state
);
todo_wine
ok
(
hr
==
S_OK
,
"get_State returned %#lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"get_State returned %#lx
\n
"
,
hr
);
todo_wine
ok
(
state
==
ForceFeedbackEffectState_Stopped
,
"get_State returned %#lx
\n
"
,
hr
);
ok
(
state
==
ForceFeedbackEffectState_Stopped
,
"get_State returned %#lx
\n
"
,
hr
);
hr
=
IForceFeedbackEffect_Start
(
effect
);
hr
=
IForceFeedbackEffect_Start
(
effect
);
todo_wine
todo_wine
...
...
dlls/windows.gaming.input/force_feedback.c
View file @
b7f51783
...
@@ -236,8 +236,25 @@ static HRESULT WINAPI effect_put_Gain( IForceFeedbackEffect *iface, DOUBLE value
...
@@ -236,8 +236,25 @@ static HRESULT WINAPI effect_put_Gain( IForceFeedbackEffect *iface, DOUBLE value
static
HRESULT
WINAPI
effect_get_State
(
IForceFeedbackEffect
*
iface
,
ForceFeedbackEffectState
*
value
)
static
HRESULT
WINAPI
effect_get_State
(
IForceFeedbackEffect
*
iface
,
ForceFeedbackEffectState
*
value
)
{
{
FIXME
(
"iface %p, value %p stub!
\n
"
,
iface
,
value
);
struct
effect
*
impl
=
impl_from_IForceFeedbackEffect
(
iface
);
return
E_NOTIMPL
;
DWORD
status
;
HRESULT
hr
;
TRACE
(
"iface %p, value %p.
\n
"
,
iface
,
value
);
EnterCriticalSection
(
&
impl
->
cs
);
if
(
!
impl
->
effect
)
*
value
=
ForceFeedbackEffectState_Stopped
;
else
if
(
FAILED
(
hr
=
IDirectInputEffect_GetEffectStatus
(
impl
->
effect
,
&
status
)))
*
value
=
ForceFeedbackEffectState_Faulted
;
else
{
if
(
status
==
DIEGES_PLAYING
)
*
value
=
ForceFeedbackEffectState_Running
;
else
*
value
=
ForceFeedbackEffectState_Stopped
;
}
LeaveCriticalSection
(
&
impl
->
cs
);
return
S_OK
;
}
}
static
HRESULT
WINAPI
effect_Start
(
IForceFeedbackEffect
*
iface
)
static
HRESULT
WINAPI
effect_Start
(
IForceFeedbackEffect
*
iface
)
...
...
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