Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
93619188
Commit
93619188
authored
16 years ago
by
Dylan Smith
Committed by
Alexandre Julliard
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
user32: Converted rcScrollBar to screen coordinates.
parent
49c1f1f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/user32/scroll.c
+4
-0
4 additions, 0 deletions
dlls/user32/scroll.c
dlls/user32/tests/scroll.c
+63
-1
63 additions, 1 deletion
dlls/user32/tests/scroll.c
with
67 additions
and
1 deletion
dlls/user32/scroll.c
+
4
−
0
View file @
93619188
...
...
@@ -1237,6 +1237,7 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in
INT
nDummy
;
DWORD
style
=
GetWindowLongW
(
hwnd
,
GWL_STYLE
);
BOOL
pressed
;
RECT
rect
;
switch
(
idObject
)
{
...
...
@@ -1252,6 +1253,9 @@ static BOOL SCROLL_GetScrollBarInfo(HWND hwnd, LONG idObject, LPSCROLLBARINFO in
SCROLL_GetScrollBarRect
(
hwnd
,
nBar
,
&
info
->
rcScrollBar
,
&
nDummy
,
&
info
->
dxyLineButton
,
&
info
->
xyThumbTop
);
/* rcScrollBar needs to be in screen coordinates */
GetWindowRect
(
hwnd
,
&
rect
);
OffsetRect
(
&
info
->
rcScrollBar
,
rect
.
left
,
rect
.
top
);
info
->
xyThumbBottom
=
info
->
xyThumbTop
+
info
->
dxyLineButton
;
...
...
This diff is collapsed.
Click to expand it.
dlls/user32/tests/scroll.c
+
63
−
1
View file @
93619188
...
...
@@ -127,6 +127,66 @@ static void scrollbar_test3(void)
}
static
void
scrollbar_test4
(
void
)
{
BOOL
ret
;
SCROLLBARINFO
sbi
;
RECT
rect
;
/* Test GetScrollBarInfo to make sure it returns rcScrollBar in screen
* coordinates. */
sbi
.
cbSize
=
sizeof
(
sbi
);
ret
=
GetScrollBarInfo
(
hScroll
,
OBJID_CLIENT
,
&
sbi
);
ok
(
ret
,
"The GetScrollBarInfo() call should not fail.
\n
"
);
GetWindowRect
(
hScroll
,
&
rect
);
ok
(
ret
,
"The GetWindowRect() call should not fail.
\n
"
);
ok
(
!
(
sbi
.
rgstate
[
0
]
&
(
STATE_SYSTEM_INVISIBLE
|
STATE_SYSTEM_OFFSCREEN
)),
"unexpected rgstate(0x%x)
\n
"
,
sbi
.
rgstate
[
0
]);
ok
(
EqualRect
(
&
rect
,
&
sbi
.
rcScrollBar
),
"WindowRect(%d, %d, %d, %d) != rcScrollBar(%d, %d, %d, %d)
\n
"
,
rect
.
top
,
rect
.
left
,
rect
.
bottom
,
rect
.
right
,
sbi
.
rcScrollBar
.
top
,
sbi
.
rcScrollBar
.
left
,
sbi
.
rcScrollBar
.
bottom
,
sbi
.
rcScrollBar
.
right
);
/* Test windows horizontal and vertical scrollbar to make sure rcScrollBar
* is still returned in screen coordinates by moving the window, and
* making sure that it shifts the rcScrollBar value. */
ShowWindow
(
hMainWnd
,
SW_SHOW
);
sbi
.
cbSize
=
sizeof
(
sbi
);
ret
=
GetScrollBarInfo
(
hMainWnd
,
OBJID_HSCROLL
,
&
sbi
);
ok
(
ret
,
"The GetScrollBarInfo() call should not fail.
\n
"
);
GetWindowRect
(
hMainWnd
,
&
rect
);
ok
(
ret
,
"The GetWindowRect() call should not fail.
\n
"
);
MoveWindow
(
hMainWnd
,
rect
.
left
+
5
,
rect
.
top
+
5
,
rect
.
right
-
rect
.
left
,
rect
.
bottom
-
rect
.
top
,
TRUE
);
rect
=
sbi
.
rcScrollBar
;
OffsetRect
(
&
rect
,
5
,
5
);
ret
=
GetScrollBarInfo
(
hMainWnd
,
OBJID_HSCROLL
,
&
sbi
);
ok
(
ret
,
"The GetScrollBarInfo() call should not fail.
\n
"
);
ok
(
EqualRect
(
&
rect
,
&
sbi
.
rcScrollBar
),
"PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)
\n
"
,
rect
.
top
,
rect
.
left
,
rect
.
bottom
,
rect
.
right
,
sbi
.
rcScrollBar
.
top
,
sbi
.
rcScrollBar
.
left
,
sbi
.
rcScrollBar
.
bottom
,
sbi
.
rcScrollBar
.
right
);
sbi
.
cbSize
=
sizeof
(
sbi
);
ret
=
GetScrollBarInfo
(
hMainWnd
,
OBJID_VSCROLL
,
&
sbi
);
ok
(
ret
,
"The GetScrollBarInfo() call should not fail.
\n
"
);
GetWindowRect
(
hMainWnd
,
&
rect
);
ok
(
ret
,
"The GetWindowRect() call should not fail.
\n
"
);
MoveWindow
(
hMainWnd
,
rect
.
left
+
5
,
rect
.
top
+
5
,
rect
.
right
-
rect
.
left
,
rect
.
bottom
-
rect
.
top
,
TRUE
);
rect
=
sbi
.
rcScrollBar
;
OffsetRect
(
&
rect
,
5
,
5
);
ret
=
GetScrollBarInfo
(
hMainWnd
,
OBJID_VSCROLL
,
&
sbi
);
ok
(
ret
,
"The GetScrollBarInfo() call should not fail.
\n
"
);
ok
(
EqualRect
(
&
rect
,
&
sbi
.
rcScrollBar
),
"PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)
\n
"
,
rect
.
top
,
rect
.
left
,
rect
.
bottom
,
rect
.
right
,
sbi
.
rcScrollBar
.
top
,
sbi
.
rcScrollBar
.
left
,
sbi
.
rcScrollBar
.
bottom
,
sbi
.
rcScrollBar
.
right
);
}
START_TEST
(
scroll
)
{
WNDCLASSA
wc
;
...
...
@@ -143,7 +203,8 @@ START_TEST ( scroll )
wc
.
lpfnWndProc
=
MyWndProc
;
RegisterClassA
(
&
wc
);
hMainWnd
=
CreateWindowExA
(
0
,
"MyTestWnd"
,
"Scroll"
,
WS_OVERLAPPEDWINDOW
,
hMainWnd
=
CreateWindowExA
(
0
,
"MyTestWnd"
,
"Scroll"
,
WS_OVERLAPPEDWINDOW
|
WS_VSCROLL
|
WS_HSCROLL
,
CW_USEDEFAULT
,
CW_USEDEFAULT
,
100
,
100
,
NULL
,
NULL
,
GetModuleHandleA
(
NULL
),
0
);
if
(
!
ok
(
hMainWnd
!=
NULL
,
"Failed to create parent window. Tests aborted.
\n
"
)
)
...
...
@@ -154,6 +215,7 @@ START_TEST ( scroll )
scrollbar_test1
();
scrollbar_test2
();
scrollbar_test3
();
scrollbar_test4
();
DestroyWindow
(
hScroll
);
DestroyWindow
(
hMainWnd
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment