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
Lorenzo Ferrillo
wine
Commits
d7ed2457
Commit
d7ed2457
authored
13 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap.
parent
ac0a7b64
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/winex11.drv/brush.c
+29
-14
29 additions, 14 deletions
dlls/winex11.drv/brush.c
with
29 additions
and
14 deletions
dlls/winex11.drv/brush.c
+
29
−
14
View file @
d7ed2457
...
...
@@ -251,6 +251,34 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap )
}
/***********************************************************************
* BRUSH_SelectDIBPatternBrush
*/
static
BOOL
BRUSH_SelectDIBPatternBrush
(
X11DRV_PDEVICE
*
physDev
,
HGLOBAL
mem
)
{
BOOL
ret
;
HDC
memdc
;
BITMAPINFO
*
info
=
GlobalLock
(
mem
);
HBITMAP
bitmap
=
CreateDIBitmap
(
physDev
->
dev
.
hdc
,
&
info
->
bmiHeader
,
CBM_INIT
,
(
LPBYTE
)
info
+
bitmap_info_size
(
info
,
DIB_RGB_COLORS
),
info
,
DIB_RGB_COLORS
);
/* make sure it's owned by x11drv */
memdc
=
CreateCompatibleDC
(
physDev
->
dev
.
hdc
);
SelectObject
(
memdc
,
bitmap
);
DeleteDC
(
memdc
);
if
((
ret
=
BRUSH_SelectPatternBrush
(
physDev
,
bitmap
)))
{
X_PHYSBITMAP
*
physBitmap
=
X11DRV_get_phys_bitmap
(
bitmap
);
physBitmap
->
pixmap
=
0
;
/* so it doesn't get freed */
}
DeleteObject
(
bitmap
);
GlobalUnlock
(
mem
);
return
ret
;
}
/***********************************************************************
* SelectBrush (X11DRV.@)
*/
...
...
@@ -258,8 +286,6 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
{
X11DRV_PDEVICE
*
physDev
=
get_x11drv_dev
(
dev
);
LOGBRUSH
logbrush
;
HBITMAP
hBitmap
;
BITMAPINFO
*
bmpInfo
;
if
(
!
GetObjectA
(
hbrush
,
sizeof
(
logbrush
),
&
logbrush
))
return
0
;
...
...
@@ -304,18 +330,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush )
case
BS_DIBPATTERN
:
TRACE
(
"BS_DIBPATTERN
\n
"
);
if
((
bmpInfo
=
GlobalLock
(
(
HGLOBAL
)
logbrush
.
lbHatch
)))
{
int
size
=
bitmap_info_size
(
bmpInfo
,
logbrush
.
lbColor
);
hBitmap
=
CreateDIBitmap
(
dev
->
hdc
,
&
bmpInfo
->
bmiHeader
,
CBM_INIT
,
((
char
*
)
bmpInfo
)
+
size
,
bmpInfo
,
(
WORD
)
logbrush
.
lbColor
);
BRUSH_SelectPatternBrush
(
physDev
,
hBitmap
);
DeleteObject
(
hBitmap
);
GlobalUnlock
(
(
HGLOBAL
)
logbrush
.
lbHatch
);
}
if
(
!
BRUSH_SelectDIBPatternBrush
(
physDev
,
(
HGLOBAL
)
logbrush
.
lbHatch
))
return
0
;
break
;
}
return
hbrush
;
...
...
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