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
157528eb
Commit
157528eb
authored
Oct 13, 2011
by
Vitaliy Margolen
Committed by
Alexandre Julliard
Oct 14, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput: GetDeviceData always succeeds regardless if buffering is enabled or device is acquired.
parent
922ae2e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
3 deletions
+23
-3
device.c
dlls/dinput/device.c
+1
-3
device.c
dlls/dinput/tests/device.c
+22
-0
No files found.
dlls/dinput/device.c
View file @
157528eb
...
...
@@ -1286,10 +1286,8 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W ifac
TRACE
(
"(%p) %p -> %p(%d) x%d, 0x%08x
\n
"
,
This
,
dod
,
entries
,
entries
?
*
entries
:
0
,
dodsize
,
flags
);
if
(
!
This
->
acquired
)
return
DIERR_NOTACQUIRED
;
if
(
!
This
->
queue_len
)
return
DI
ERR_NOTBUFFERED
;
return
DI
_OK
;
if
(
dodsize
<
sizeof
(
DIDEVICEOBJECTDATA_DX3
))
return
DIERR_INVALIDPARAM
;
...
...
dlls/dinput/tests/device.c
View file @
157528eb
...
...
@@ -103,6 +103,9 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd)
hr
=
IDirectInputDevice_GetObjectInfo
(
device
,
&
obj_info
,
16
,
DIPH_BYOFFSET
);
if
(
SUCCEEDED
(
hr
))
{
DWORD
cnt
;
DIDEVICEOBJECTDATA
buffer
[
5
];
/* No device supports per axis relative/absolute mode */
memset
(
&
dp
,
0
,
sizeof
(
dp
));
dp
.
diph
.
dwSize
=
sizeof
(
DIPROPDWORD
);
...
...
@@ -119,9 +122,28 @@ static void test_object_info(LPDIRECTINPUTDEVICE device, HWND hwnd)
hr
=
IDirectInputDevice_SetProperty
(
device
,
DIPROP_AXISMODE
,
&
dp
.
diph
);
ok
(
hr
==
DI_OK
,
"SetProperty() failed: %08x
\n
"
,
hr
);
dp
.
dwData
=
0
;
hr
=
IDirectInputDevice_SetProperty
(
device
,
DIPROP_BUFFERSIZE
,
(
LPCDIPROPHEADER
)
&
dp
.
diph
);
ok
(
hr
==
DI_OK
,
"SetProperty() failed: %08x
\n
"
,
hr
);
cnt
=
5
;
hr
=
IDirectInputDevice_GetDeviceData
(
device
,
sizeof
(
buffer
),
buffer
,
&
cnt
,
0
);
ok
(
hr
==
DI_OK
&&
cnt
==
5
,
"GetDeviceData() failed: %08x cnt: %d
\n
"
,
hr
,
cnt
);
dp
.
dwData
=
20
;
hr
=
IDirectInputDevice_SetProperty
(
device
,
DIPROP_BUFFERSIZE
,
(
LPCDIPROPHEADER
)
&
dp
.
diph
);
ok
(
hr
==
DI_OK
,
"SetProperty() failed: %08x
\n
"
,
hr
);
cnt
=
1
;
hr
=
IDirectInputDevice_GetDeviceData
(
device
,
sizeof
(
buffer
),
buffer
,
&
cnt
,
0
);
ok
(
hr
==
DI_OK
,
"GetDeviceData() failed: %08x
\n
"
,
hr
);
/* Cannot change mode while acquired */
hr
=
IDirectInputDevice_Acquire
(
device
);
ok
(
hr
==
DI_OK
,
"Acquire() failed: %08x
\n
"
,
hr
);
cnt
=
1
;
hr
=
IDirectInputDevice_GetDeviceData
(
device
,
sizeof
(
buffer
),
buffer
,
&
cnt
,
0
);
ok
(
hr
==
DI_OK
,
"GetDeviceData() failed: %08x
\n
"
,
hr
);
hr
=
IDirectInputDevice_SetProperty
(
device
,
DIPROP_AXISMODE
,
&
dp
.
diph
);
ok
(
hr
==
DIERR_ACQUIRED
,
"SetProperty() returned: %08x
\n
"
,
hr
);
hr
=
IDirectInputDevice_Unacquire
(
device
);
...
...
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