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
2da8f5d2
Commit
2da8f5d2
authored
Mar 27, 2023
by
Rémi Bernon
Committed by
Alexandre Julliard
Mar 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Trace formats in (Build|Set)ActionMap and EnumDevicesBySemantics.
parent
8e63f68f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
2 deletions
+34
-2
device.c
dlls/dinput/device.c
+22
-2
dinput.c
dlls/dinput/dinput.c
+12
-0
No files found.
dlls/dinput/device.c
View file @
2da8f5d2
...
...
@@ -1815,7 +1815,7 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
BOOL
load_success
=
FALSE
;
BOOL
*
mapped
;
FIXME
(
"iface %p, format %p, username %s, flags %#lx stub!
\n
"
,
iface
,
format
,
TRACE
(
"iface %p, format %p, username %s, flags %#lx
\n
"
,
iface
,
format
,
debugstr_w
(
username
),
flags
);
if
(
!
format
)
return
DIERR_INVALIDPARAM
;
...
...
@@ -1825,6 +1825,16 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
if
(
format
->
dwNumActions
*
4
!=
format
->
dwDataSize
)
return
DIERR_INVALIDPARAM
;
TRACE
(
"format guid %s, genre %#lx, name %s
\n
"
,
debugstr_guid
(
&
format
->
guidActionMap
),
format
->
dwGenre
,
debugstr_w
(
format
->
tszActionMap
)
);
for
(
i
=
0
;
i
<
format
->
dwNumActions
;
i
++
)
{
DIACTIONW
*
action
=
format
->
rgoAction
+
i
;
TRACE
(
" %lu: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s
\n
"
,
i
,
action
->
uAppData
,
action
->
dwSemantic
,
action
->
dwFlags
,
debugstr_guid
(
&
action
->
guidInstance
),
action
->
dwObjID
,
action
->
dwHow
,
debugstr_w
(
action
->
lptszActionName
)
);
}
action_end
=
format
->
rgoAction
+
format
->
dwNumActions
;
for
(
action
=
format
->
rgoAction
;
action
<
action_end
;
action
++
)
{
...
...
@@ -1968,12 +1978,22 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
int
i
,
index
;
HRESULT
hr
;
FIXME
(
"iface %p, format %p, username %s, flags %#lx stub!
\n
"
,
iface
,
format
,
TRACE
(
"iface %p, format %p, username %s, flags %#lx
\n
"
,
iface
,
format
,
debugstr_w
(
username
),
flags
);
if
(
!
format
)
return
DIERR_INVALIDPARAM
;
if
(
flags
!=
DIDSAM_DEFAULT
&&
flags
!=
DIDSAM_FORCESAVE
&&
flags
!=
DIDSAM_NOUSER
)
return
DIERR_INVALIDPARAM
;
TRACE
(
"format guid %s, genre %#lx, name %s
\n
"
,
debugstr_guid
(
&
format
->
guidActionMap
),
format
->
dwGenre
,
debugstr_w
(
format
->
tszActionMap
)
);
for
(
i
=
0
;
i
<
format
->
dwNumActions
;
i
++
)
{
DIACTIONW
*
action
=
format
->
rgoAction
+
i
;
TRACE
(
" %u: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s
\n
"
,
i
,
action
->
uAppData
,
action
->
dwSemantic
,
action
->
dwFlags
,
debugstr_guid
(
&
action
->
guidInstance
),
action
->
dwObjID
,
action
->
dwHow
,
debugstr_w
(
action
->
lptszActionName
)
);
}
if
(
!
(
data_format
.
rgodf
=
malloc
(
sizeof
(
DIOBJECTDATAFORMAT
)
*
format
->
dwNumActions
)))
return
DIERR_OUTOFMEMORY
;
data_format
.
dwDataSize
=
format
->
dwDataSize
;
...
...
dlls/dinput/dinput.c
View file @
2da8f5d2
...
...
@@ -519,6 +519,18 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con
FIXME
(
"iface %p, username %s, action_format %p, callback %p, context %p, flags %#lx stub!
\n
"
,
iface
,
debugstr_w
(
username
),
action_format
,
callback
,
context
,
flags
);
if
(
!
action_format
)
return
DIERR_INVALIDPARAM
;
TRACE
(
"format guid %s, genre %#lx, name %s
\n
"
,
debugstr_guid
(
&
action_format
->
guidActionMap
),
action_format
->
dwGenre
,
debugstr_w
(
action_format
->
tszActionMap
)
);
for
(
i
=
0
;
i
<
action_format
->
dwNumActions
;
i
++
)
{
DIACTIONW
*
action
=
action_format
->
rgoAction
+
i
;
TRACE
(
" %u: app_data %#Ix, semantic %#lx, flags %#lx, instance %s, obj_id %#lx, how %#lx, name %s
\n
"
,
i
,
action
->
uAppData
,
action
->
dwSemantic
,
action
->
dwFlags
,
debugstr_guid
(
&
action
->
guidInstance
),
action
->
dwObjID
,
action
->
dwHow
,
debugstr_w
(
action
->
lptszActionName
)
);
}
didevi
.
dwSize
=
sizeof
(
didevi
);
hr
=
IDirectInput8_EnumDevices
(
&
impl
->
IDirectInput8W_iface
,
DI8DEVCLASS_GAMECTRL
,
...
...
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