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
5bd003ed
Commit
5bd003ed
authored
13 years ago
by
Huw Davies
Committed by
Alexandre Julliard
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gdi32: When creating a dib_info from a ddb, always make a copy of the colour map.
parent
2a5cabc2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/gdi32/dibdrv/bitblt.c
+13
-4
13 additions, 4 deletions
dlls/gdi32/dibdrv/bitblt.c
dlls/gdi32/dibdrv/dc.c
+2
-1
2 additions, 1 deletion
dlls/gdi32/dibdrv/dc.c
with
15 additions
and
5 deletions
dlls/gdi32/dibdrv/bitblt.c
+
13
−
4
View file @
5bd003ed
...
...
@@ -604,7 +604,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info,
struct
gdi_image_bits
*
bits
,
struct
bitblt_coords
*
src
)
{
DWORD
ret
=
ERROR_SUCCESS
;
dib_info
*
dib
,
stand_alone
;
dib_info
*
dib
=
NULL
,
stand_alone
;
TRACE
(
"%p %p %p
\n
"
,
dev
,
hbitmap
,
info
);
...
...
@@ -651,7 +651,12 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info,
}
done:
if
(
hbitmap
)
GDI_ReleaseObj
(
hbitmap
);
if
(
hbitmap
)
{
if
(
dib
)
free_dib_info
(
dib
);
GDI_ReleaseObj
(
hbitmap
);
}
return
ret
;
}
...
...
@@ -707,7 +712,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info
const
struct
gdi_image_bits
*
bits
,
struct
bitblt_coords
*
src
,
struct
bitblt_coords
*
dst
,
DWORD
rop
)
{
dib_info
*
dib
,
stand_alone
;
dib_info
*
dib
=
NULL
,
stand_alone
;
DWORD
ret
;
dib_info
src_dib
;
HRGN
saved_clip
=
NULL
;
...
...
@@ -780,7 +785,11 @@ update_format:
ret
=
ERROR_BAD_FORMAT
;
done:
if
(
hbitmap
)
GDI_ReleaseObj
(
hbitmap
);
if
(
hbitmap
)
{
if
(
dib
)
free_dib_info
(
dib
);
GDI_ReleaseObj
(
hbitmap
);
}
return
ret
;
}
This diff is collapsed.
Click to expand it.
dlls/gdi32/dibdrv/dc.c
+
2
−
1
View file @
5bd003ed
...
...
@@ -219,7 +219,8 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_f
BITMAPINFO
*
info
=
(
BITMAPINFO
*
)
buffer
;
get_ddb_bitmapinfo
(
bmp
,
info
);
return
init_dib_info_from_bitmapinfo
(
dib
,
info
,
bmp
->
bitmap
.
bmBits
,
flags
);
return
init_dib_info_from_bitmapinfo
(
dib
,
info
,
bmp
->
bitmap
.
bmBits
,
flags
|
private_color_table
);
}
return
init_dib_info
(
dib
,
&
bmp
->
dib
->
dsBmih
,
bmp
->
dib
->
dsBitfields
,
bmp
->
color_table
,
bmp
->
nb_colors
,
bmp
->
dib
->
dsBm
.
bmBits
,
flags
);
...
...
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