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
359ee2ec
Commit
359ee2ec
authored
Jun 25, 2020
by
Rémi Bernon
Committed by
Alexandre Julliard
Jun 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user32: Return failure when rawinput has been overwritten.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
3a9edf9a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
rawinput.c
dlls/user32/rawinput.c
+2
-1
input.c
dlls/user32/tests/input.c
+0
-3
No files found.
dlls/user32/rawinput.c
View file @
359ee2ec
...
@@ -459,7 +459,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT *
...
@@ -459,7 +459,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT *
TRACE
(
"rawinput %p, command %#x, data %p, data_size %p, header_size %u.
\n
"
,
TRACE
(
"rawinput %p, command %#x, data %p, data_size %p, header_size %u.
\n
"
,
rawinput
,
command
,
data
,
data_size
,
header_size
);
rawinput
,
command
,
data
,
data_size
,
header_size
);
if
(
!
ri
)
if
(
!
ri
||
!
ri
->
header
.
dwSize
)
return
~
0U
;
return
~
0U
;
if
(
header_size
!=
sizeof
(
RAWINPUTHEADER
))
if
(
header_size
!=
sizeof
(
RAWINPUTHEADER
))
...
@@ -488,6 +488,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT *
...
@@ -488,6 +488,7 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT *
if
(
*
data_size
<
s
)
return
~
0U
;
if
(
*
data_size
<
s
)
return
~
0U
;
memcpy
(
data
,
ri
,
s
);
memcpy
(
data
,
ri
,
s
);
ri
->
header
.
dwSize
=
0
;
return
s
;
return
s
;
}
}
...
...
dlls/user32/tests/input.c
View file @
359ee2ec
...
@@ -1913,11 +1913,8 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara
...
@@ -1913,11 +1913,8 @@ static LRESULT CALLBACK rawinputbuffer_wndproc(HWND hwnd, UINT msg, WPARAM wpara
ok
(
ri
.
data
.
mouse
.
lLastX
==
6
,
"Unexpected rawinput data: %d
\n
"
,
ri
.
data
.
mouse
.
lLastX
);
ok
(
ri
.
data
.
mouse
.
lLastX
==
6
,
"Unexpected rawinput data: %d
\n
"
,
ri
.
data
.
mouse
.
lLastX
);
}
}
else
else
{
todo_wine
ok
(
count
==
~
0U
,
"GetRawInputData succeeded
\n
"
);
ok
(
count
==
~
0U
,
"GetRawInputData succeeded
\n
"
);
}
}
}
return
DefWindowProcA
(
hwnd
,
msg
,
wparam
,
lparam
);
return
DefWindowProcA
(
hwnd
,
msg
,
wparam
,
lparam
);
}
}
...
...
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