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
b9801bba
Commit
b9801bba
authored
Apr 12, 2008
by
Vitaliy Margolen
Committed by
Alexandre Julliard
Apr 14, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Assign button GUID to joystick buttons.
parent
2e80f11c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
joystick_linux.c
dlls/dinput/joystick_linux.c
+1
-0
joystick_linuxinput.c
dlls/dinput/joystick_linuxinput.c
+2
-1
No files found.
dlls/dinput/joystick_linux.c
View file @
b9801bba
...
...
@@ -471,6 +471,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di
for
(
i
=
0
;
i
<
newDevice
->
buttons
;
i
++
)
{
memcpy
(
&
df
->
rgodf
[
idx
],
&
c_dfDIJoystick2
.
rgodf
[
i
+
12
],
df
->
dwObjSize
);
df
->
rgodf
[
idx
].
pguid
=
&
GUID_Button
;
df
->
rgodf
[
idx
++
].
dwType
=
DIDFT_MAKEINSTANCE
(
i
)
|
DIDFT_PSHBUTTON
;
}
newDevice
->
base
.
data_format
.
wine_df
=
df
;
...
...
dlls/dinput/joystick_linuxinput.c
View file @
b9801bba
...
...
@@ -373,7 +373,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN
if
(
id
>=
have_joydevs
)
{
return
FALSE
;
}
if
(
!
((
dwDevType
==
0
)
||
((
dwDevType
==
DIDEVTYPE_JOYSTICK
)
&&
(
version
<
0x0800
))
||
(((
dwDevType
==
DI8DEVCLASS_GAMECTRL
)
||
(
dwDevType
==
DI8DEVTYPE_JOYSTICK
))
&&
(
version
>=
0x0800
))))
...
...
@@ -498,6 +498,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm
memcpy
(
&
df
->
rgodf
[
idx
],
&
c_dfDIJoystick2
.
rgodf
[
newDevice
->
numButtons
+
WINE_JOYSTICK_MAX_AXES
+
WINE_JOYSTICK_MAX_POVS
],
df
->
dwObjSize
);
newDevice
->
buttons
[
i
]
=
0x80
|
newDevice
->
numButtons
;
df
->
rgodf
[
idx
].
pguid
=
&
GUID_Button
;
df
->
rgodf
[
idx
++
].
dwType
=
DIDFT_MAKEINSTANCE
(
newDevice
->
numButtons
++
)
|
DIDFT_PSHBUTTON
;
}
df
->
dwNumObjs
=
idx
;
...
...
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