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
ac9a10f8
Commit
ac9a10f8
authored
Aug 20, 2012
by
Lucas Zawacki
Committed by
Alexandre Julliard
Aug 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Return a valid keyboard type in keyboard GetCapabilities.
parent
5b3ccdf0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
keyboard.c
dlls/dinput/keyboard.c
+2
-2
keyboard.c
dlls/dinput/tests/keyboard.c
+1
-1
No files found.
dlls/dinput/keyboard.c
View file @
ac9a10f8
...
...
@@ -375,9 +375,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa
devcaps
.
dwSize
=
lpDIDevCaps
->
dwSize
;
devcaps
.
dwFlags
=
DIDC_ATTACHED
|
DIDC_EMULATED
;
if
(
This
->
base
.
dinput
->
dwVersion
>=
0x0800
)
devcaps
.
dwDevType
=
DI8DEVTYPE_KEYBOARD
|
(
DI8DEVTYPEKEYBOARD_UNKNOWN
<<
8
);
devcaps
.
dwDevType
=
DI8DEVTYPE_KEYBOARD
|
(
DI8DEVTYPEKEYBOARD_PCENH
<<
8
);
else
devcaps
.
dwDevType
=
DIDEVTYPE_KEYBOARD
|
(
DIDEVTYPEKEYBOARD_UNKNOWN
<<
8
);
devcaps
.
dwDevType
=
DIDEVTYPE_KEYBOARD
|
(
DIDEVTYPEKEYBOARD_PCENH
<<
8
);
devcaps
.
dwAxes
=
0
;
devcaps
.
dwButtons
=
This
->
base
.
data_format
.
wine_df
->
dwNumObjs
;
devcaps
.
dwPOVs
=
0
;
...
...
dlls/dinput/tests/keyboard.c
View file @
ac9a10f8
...
...
@@ -187,7 +187,7 @@ static void test_capabilities(LPDIRECTINPUT pDI, HWND hwnd)
ok
(
caps
.
dwFlags
&
DIDC_ATTACHED
,
"GetCapabilites dwFlags: 0x%08x
\n
"
,
caps
.
dwFlags
);
ok
(
LOWORD
(
LOBYTE
(
caps
.
dwDevType
))
==
DIDEVTYPE_KEYBOARD
,
"GetCapabilities invalid device type for dwDevType: 0x%08x
\n
"
,
caps
.
dwDevType
);
todo_wine
ok
(
LOWORD
(
HIBYTE
(
caps
.
dwDevType
))
!=
DIDEVTYPEKEYBOARD_UNKNOWN
,
ok
(
LOWORD
(
HIBYTE
(
caps
.
dwDevType
))
!=
DIDEVTYPEKEYBOARD_UNKNOWN
,
"GetCapabilities invalid device subtype for dwDevType: 0x%08x
\n
"
,
caps
.
dwDevType
);
if
(
pKeyboard
)
IUnknown_Release
(
pKeyboard
);
...
...
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