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
27bb362f
Commit
27bb362f
authored
Oct 14, 1998
by
Ulrich Weigand
Committed by
Alexandre Julliard
Oct 14, 1998
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not clip source rectangle even by visible region for bitblts.
Added field 'totalExtent' to WIN_DC_INFO.
parent
ff1c569d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
6 deletions
+25
-6
bitblt.c
graphics/x11drv/bitblt.c
+4
-3
bitmap.c
graphics/x11drv/bitmap.c
+5
-0
init.c
graphics/x11drv/init.c
+13
-3
gdi.h
include/gdi.h
+1
-0
dc.c
objects/dc.c
+2
-0
No files found.
graphics/x11drv/bitblt.c
View file @
27bb362f
...
...
@@ -1043,9 +1043,10 @@ static BOOL32 BITBLT_GetVisRectangles( DC *dcDst, INT32 xDst, INT32 yDst,
SetRect32
(
&
rect
,
xSrc
,
ySrc
,
xSrc
+
widthSrc
,
ySrc
+
heightSrc
);
if
(
widthSrc
<
0
)
SWAP_INT32
(
&
rect
.
left
,
&
rect
.
right
);
if
(
heightSrc
<
0
)
SWAP_INT32
(
&
rect
.
top
,
&
rect
.
bottom
);
/* Apparently the clip region is only for output, so use hVisRgn here */
GetRgnBox32
(
dcSrc
->
w
.
hVisRgn
,
&
clipRect
);
if
(
!
IntersectRect32
(
visRectSrc
,
&
rect
,
&
clipRect
))
return
FALSE
;
/* Apparently the clipping and visible regions are only for output,
so just check against totalExtent here to avoid BadMatch errors */
if
(
!
IntersectRect32
(
visRectSrc
,
&
rect
,
&
dcSrc
->
w
.
totalExtent
))
return
FALSE
;
/* Intersect the rectangles */
...
...
graphics/x11drv/bitmap.c
View file @
27bb362f
...
...
@@ -54,6 +54,11 @@ HBITMAP32 X11DRV_BITMAP_SelectObject( DC * dc, HBITMAP32 hbitmap,
if
(
!
(
dc
->
w
.
flags
&
DC_MEMORY
))
return
0
;
dc
->
w
.
totalExtent
.
left
=
0
;
dc
->
w
.
totalExtent
.
top
=
0
;
dc
->
w
.
totalExtent
.
right
=
bmp
->
bitmap
.
bmWidth
;
dc
->
w
.
totalExtent
.
bottom
=
bmp
->
bitmap
.
bmHeight
;
if
(
dc
->
w
.
hVisRgn
)
SetRectRgn32
(
dc
->
w
.
hVisRgn
,
0
,
0
,
bmp
->
bitmap
.
bmWidth
,
bmp
->
bitmap
.
bmHeight
);
...
...
graphics/x11drv/init.c
View file @
27bb362f
...
...
@@ -178,8 +178,13 @@ static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
physDev
->
drawable
=
bmp
->
pixmap
;
physDev
->
gc
=
TSXCreateGC
(
display
,
physDev
->
drawable
,
0
,
NULL
);
dc
->
w
.
bitsPerPixel
=
bmp
->
bitmap
.
bmBitsPixel
;
dc
->
w
.
hVisRgn
=
CreateRectRgn32
(
0
,
0
,
bmp
->
bitmap
.
bmWidth
,
bmp
->
bitmap
.
bmHeight
);
dc
->
w
.
totalExtent
.
left
=
0
;
dc
->
w
.
totalExtent
.
top
=
0
;
dc
->
w
.
totalExtent
.
right
=
bmp
->
bitmap
.
bmWidth
;
dc
->
w
.
totalExtent
.
bottom
=
bmp
->
bitmap
.
bmHeight
;
dc
->
w
.
hVisRgn
=
CreateRectRgnIndirect32
(
&
dc
->
w
.
totalExtent
);
GDI_HEAP_UNLOCK
(
dc
->
w
.
hBitmap
);
}
else
...
...
@@ -187,7 +192,12 @@ static BOOL32 X11DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
physDev
->
drawable
=
rootWindow
;
physDev
->
gc
=
TSXCreateGC
(
display
,
physDev
->
drawable
,
0
,
NULL
);
dc
->
w
.
bitsPerPixel
=
screenDepth
;
dc
->
w
.
hVisRgn
=
CreateRectRgn32
(
0
,
0
,
screenWidth
,
screenHeight
);
dc
->
w
.
totalExtent
.
left
=
0
;
dc
->
w
.
totalExtent
.
top
=
0
;
dc
->
w
.
totalExtent
.
right
=
screenWidth
;
dc
->
w
.
totalExtent
.
bottom
=
screenHeight
;
dc
->
w
.
hVisRgn
=
CreateRectRgnIndirect32
(
&
dc
->
w
.
totalExtent
);
}
if
(
!
dc
->
w
.
hVisRgn
)
...
...
include/gdi.h
View file @
27bb362f
...
...
@@ -122,6 +122,7 @@ typedef struct
short
breakExtra
;
/* breakTotalExtra / breakCount */
short
breakRem
;
/* breakTotalExtra % breakCount */
RECT32
totalExtent
;
BYTE
bitsPerPixel
;
INT32
MapMode
;
...
...
objects/dc.c
View file @
27bb362f
...
...
@@ -528,6 +528,7 @@ HDC16 WINAPI GetDCState( HDC16 hdc )
newdc
->
w
.
hFirstBitmap
=
dc
->
w
.
hFirstBitmap
;
newdc
->
w
.
hDevice
=
dc
->
w
.
hDevice
;
newdc
->
w
.
hPalette
=
dc
->
w
.
hPalette
;
newdc
->
w
.
totalExtent
=
dc
->
w
.
totalExtent
;
newdc
->
w
.
bitsPerPixel
=
dc
->
w
.
bitsPerPixel
;
newdc
->
w
.
ROPmode
=
dc
->
w
.
ROPmode
;
newdc
->
w
.
polyFillMode
=
dc
->
w
.
polyFillMode
;
...
...
@@ -613,6 +614,7 @@ void WINAPI SetDCState( HDC16 hdc, HDC16 hdcs )
dc
->
w
.
devCaps
=
dcs
->
w
.
devCaps
;
dc
->
w
.
hFirstBitmap
=
dcs
->
w
.
hFirstBitmap
;
dc
->
w
.
hDevice
=
dcs
->
w
.
hDevice
;
dc
->
w
.
totalExtent
=
dcs
->
w
.
totalExtent
;
dc
->
w
.
ROPmode
=
dcs
->
w
.
ROPmode
;
dc
->
w
.
polyFillMode
=
dcs
->
w
.
polyFillMode
;
dc
->
w
.
stretchBltMode
=
dcs
->
w
.
stretchBltMode
;
...
...
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