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
f10f98cf
Commit
f10f98cf
authored
Nov 10, 2019
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Nov 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: Keyboard device doesn't support property DIPROP_VIDPID.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ecb2c8dd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
keyboard.c
dlls/dinput/keyboard.c
+1
-0
keyboard.c
dlls/dinput/tests/keyboard.c
+10
-0
No files found.
dlls/dinput/keyboard.c
View file @
f10f98cf
...
...
@@ -577,6 +577,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface,
memcpy
(
ps
->
wsz
,
didoi
.
tszName
,
sizeof
(
ps
->
wsz
));
return
hr
;
}
case
(
DWORD_PTR
)
DIPROP_VIDPID
:
case
(
DWORD_PTR
)
DIPROP_RANGE
:
return
DIERR_UNSUPPORTED
;
default:
...
...
dlls/dinput/tests/keyboard.c
View file @
f10f98cf
...
...
@@ -258,6 +258,7 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd)
HRESULT
hr
;
IDirectInputDeviceA
*
pKeyboard
=
NULL
;
DIPROPRANGE
diprg
;
DIPROPDWORD
vidpid
;
hr
=
IDirectInput_CreateDevice
(
pDI
,
&
GUID_SysKeyboard
,
&
pKeyboard
,
NULL
);
ok
(
SUCCEEDED
(
hr
),
"IDirectInput_CreateDevice() failed: %08x
\n
"
,
hr
);
...
...
@@ -272,6 +273,15 @@ static void test_get_prop(IDirectInputA *pDI, HWND hwnd)
hr
=
IDirectInputDevice_GetProperty
(
pKeyboard
,
DIPROP_RANGE
,
&
diprg
.
diph
);
ok
(
hr
==
DIERR_UNSUPPORTED
,
"IDirectInputDevice_GetProperty() did not return DIPROP_RANGE but: %08x
\n
"
,
hr
);
memset
(
&
vidpid
,
0
,
sizeof
(
vidpid
));
vidpid
.
diph
.
dwSize
=
sizeof
(
DIPROPDWORD
);
vidpid
.
diph
.
dwHeaderSize
=
sizeof
(
DIPROPHEADER
);
vidpid
.
diph
.
dwHow
=
DIPH_DEVICE
;
vidpid
.
diph
.
dwObj
=
0
;
hr
=
IDirectInputDevice_GetProperty
(
pKeyboard
,
DIPROP_VIDPID
,
&
vidpid
.
diph
);
ok
(
hr
==
DIERR_UNSUPPORTED
,
"got %08x
\n
"
,
hr
);
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