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
766287ad
Commit
766287ad
authored
Jul 11, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Return the surface rect as top clipping rect.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6ccb9439
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
dc.c
dlls/gdi32/dibdrv/dc.c
+1
-6
painting.c
dlls/user32/painting.c
+1
-1
window.c
server/window.c
+1
-1
No files found.
dlls/gdi32/dibdrv/dc.c
View file @
766287ad
...
@@ -572,7 +572,6 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface )
...
@@ -572,7 +572,6 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface )
{
{
char
buffer
[
FIELD_OFFSET
(
BITMAPINFO
,
bmiColors
[
256
]
)];
char
buffer
[
FIELD_OFFSET
(
BITMAPINFO
,
bmiColors
[
256
]
)];
BITMAPINFO
*
info
=
(
BITMAPINFO
*
)
buffer
;
BITMAPINFO
*
info
=
(
BITMAPINFO
*
)
buffer
;
RECT
rect
;
void
*
bits
;
void
*
bits
;
PHYSDEV
windev
;
PHYSDEV
windev
;
struct
windrv_physdev
*
physdev
;
struct
windrv_physdev
*
physdev
;
...
@@ -599,12 +598,8 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface )
...
@@ -599,12 +598,8 @@ void dibdrv_set_window_surface( DC *dc, struct window_surface *surface )
dibdrv
=
physdev
->
dibdrv
;
dibdrv
=
physdev
->
dibdrv
;
bits
=
surface
->
funcs
->
get_info
(
surface
,
info
);
bits
=
surface
->
funcs
->
get_info
(
surface
,
info
);
init_dib_info_from_bitmapinfo
(
&
dibdrv
->
dib
,
info
,
bits
);
init_dib_info_from_bitmapinfo
(
&
dibdrv
->
dib
,
info
,
bits
);
/* clip the device rect to the surface */
rect
=
surface
->
rect
;
offset_rect
(
&
rect
,
dc
->
device_rect
.
left
,
dc
->
device_rect
.
top
);
intersect_rect
(
&
dc
->
device_rect
,
&
dc
->
device_rect
,
&
rect
);
dibdrv
->
dib
.
rect
=
dc
->
vis_rect
;
dibdrv
->
dib
.
rect
=
dc
->
vis_rect
;
offset_rect
(
&
dibdrv
->
dib
.
rect
,
-
rect
.
left
,
-
rect
.
top
);
offset_rect
(
&
dibdrv
->
dib
.
rect
,
-
dc
->
device_rect
.
left
,
-
dc
->
device_
rect
.
top
);
dibdrv
->
bounds
=
surface
->
funcs
->
get_bounds
(
surface
);
dibdrv
->
bounds
=
surface
->
funcs
->
get_bounds
(
surface
);
DC_InitDC
(
dc
);
DC_InitDC
(
dc
);
}
}
...
...
dlls/user32/painting.c
View file @
766287ad
...
@@ -179,7 +179,7 @@ static void update_visible_region( struct dce *dce )
...
@@ -179,7 +179,7 @@ static void update_visible_region( struct dce *dce )
}
}
}
}
if
(
!
surface
)
top_rect
=
get_virtual_screen_rect
(
);
if
(
!
surface
)
SetRectEmpty
(
&
top_rect
);
__wine_set_visible_region
(
dce
->
hdc
,
vis_rgn
,
&
win_rect
,
&
top_rect
,
surface
);
__wine_set_visible_region
(
dce
->
hdc
,
vis_rgn
,
&
win_rect
,
&
top_rect
,
surface
);
if
(
surface
)
window_surface_release
(
surface
);
if
(
surface
)
window_surface_release
(
surface
);
}
}
...
...
server/window.c
View file @
766287ad
...
@@ -2445,7 +2445,7 @@ DECL_HANDLER(get_visible_region)
...
@@ -2445,7 +2445,7 @@ DECL_HANDLER(get_visible_region)
if
(
data
)
set_reply_data_ptr
(
data
,
reply
->
total_size
);
if
(
data
)
set_reply_data_ptr
(
data
,
reply
->
total_size
);
}
}
reply
->
top_win
=
top
->
handle
;
reply
->
top_win
=
top
->
handle
;
reply
->
top_rect
=
top
->
visibl
e_rect
;
reply
->
top_rect
=
top
->
surfac
e_rect
;
if
(
!
is_desktop_window
(
win
))
if
(
!
is_desktop_window
(
win
))
{
{
...
...
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