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
5bb094c9
Commit
5bb094c9
authored
Nov 08, 2011
by
Vitaliy Margolen
Committed by
Alexandre Julliard
Nov 09, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Return correct key names for num_lock and pause.
Scan codes and DIK codes for num_lock and pause are reversed.
parent
6acf226f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
keyboard.c
dlls/dinput/keyboard.c
+9
-6
No files found.
dlls/dinput/keyboard.c
View file @
5bb094c9
...
...
@@ -410,12 +410,14 @@ SysKeyboardAImpl_GetObjectInfo(
DWORD
dwHow
)
{
HRESULT
res
;
LONG
scan
;
res
=
IDirectInputDevice2AImpl_GetObjectInfo
(
iface
,
pdidoi
,
dwObj
,
dwHow
);
if
(
res
!=
DI_OK
)
return
res
;
if
(
!
GetKeyNameTextA
((
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
)
&
0x80
)
<<
17
|
(
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
)
&
0x7f
)
<<
16
,
scan
=
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
);
if
(
scan
==
DIK_PAUSE
||
scan
==
DIK_NUMLOCK
)
scan
^=
0x80
;
if
(
!
GetKeyNameTextA
((
scan
&
0x80
)
<<
17
|
(
scan
&
0x7f
)
<<
16
,
pdidoi
->
tszName
,
sizeof
(
pdidoi
->
tszName
)))
return
DIERR_OBJECTNOTFOUND
;
...
...
@@ -429,14 +431,15 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface
DWORD
dwHow
)
{
HRESULT
res
;
LONG
scan
;
res
=
IDirectInputDevice2WImpl_GetObjectInfo
(
iface
,
pdidoi
,
dwObj
,
dwHow
);
if
(
res
!=
DI_OK
)
return
res
;
if
(
!
GetKeyNameTextW
((
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
)
&
0x80
)
<<
17
|
(
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
)
&
0x7f
)
<<
16
,
pdidoi
->
tszName
,
sizeof
(
pdidoi
->
tszName
)
/
sizeof
(
pdidoi
->
tszName
[
0
]
)))
scan
=
DIDFT_GETINSTANCE
(
pdidoi
->
dwType
);
if
(
scan
==
DIK_PAUSE
||
scan
==
DIK_NUMLOCK
)
scan
^=
0x80
;
if
(
!
GetKeyNameTextW
((
scan
&
0x80
)
<<
17
|
(
scan
&
0x7f
)
<<
16
,
pdidoi
->
tszName
,
sizeof
(
pdidoi
->
tszName
)))
return
DIERR_OBJECTNOTFOUND
;
_dump_OBJECTINSTANCEW
(
pdidoi
);
...
...
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