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
Zsolt Vadász
wine
Commits
c9e02e11
Commit
c9e02e11
authored
19 years ago
by
Peter Beutner
Committed by
Alexandre Julliard
19 years ago
Browse files
Options
Downloads
Patches
Plain Diff
When creating DIBs with a color depth <= 8, always set biClrUsed field
to the number of entries in the color table.
parent
deaae4b8
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/gdi/dib.c
+4
-0
4 additions, 0 deletions
dlls/gdi/dib.c
dlls/gdi/tests/bitmap.c
+27
-0
27 additions, 0 deletions
dlls/gdi/tests/bitmap.c
with
31 additions
and
0 deletions
dlls/gdi/dib.c
+
4
−
0
View file @
c9e02e11
...
...
@@ -1180,6 +1180,10 @@ HBITMAP DIB_CreateDIBSection(HDC hdc, const BITMAPINFO *bmi, UINT usage,
dib
->
dsBmih
.
biSize
=
sizeof
(
BITMAPINFOHEADER
);
}
/* set number of entries in bmi.bmiColors table */
if
(
bpp
<=
8
)
dib
->
dsBmih
.
biClrUsed
=
1
<<
bpp
;
/* only use sizeImage if it's valid and we're dealing with a compressed bitmap */
if
(
sizeImage
&&
(
compression
==
BI_RLE4
||
compression
==
BI_RLE8
))
dib
->
dsBmih
.
biSizeImage
=
sizeImage
;
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi/tests/bitmap.c
+
27
−
0
View file @
c9e02e11
...
...
@@ -194,6 +194,7 @@ static void test_dibsections(void)
WORD
*
index
;
DWORD
*
bits32
;
HPALETTE
hpal
,
oldpal
;
DIBSECTION
dibsec
;
COLORREF
c0
,
c1
;
int
i
;
int
screen_depth
;
...
...
@@ -216,6 +217,9 @@ static void test_dibsections(void)
hdib
=
CreateDIBSection
(
hdc
,
pbmi
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
ok
(
hdib
!=
NULL
,
"CreateDIBSection failed
\n
"
);
ok
(
GetObject
(
hdib
,
sizeof
(
DIBSECTION
),
&
dibsec
)
!=
0
,
"GetObject failed for DIBSection
\n
"
);
ok
(
dibsec
.
dsBmih
.
biClrUsed
==
2
,
"created DIBSection: wrong biClrUsed field: %lu, should be: %u
\n
"
,
dibsec
.
dsBmih
.
biClrUsed
,
2
);
/* Test if the old BITMAPCOREINFO structure is supported */
...
...
@@ -280,6 +284,19 @@ static void test_dibsections(void)
SelectObject
(
hdcmem
,
oldbm
);
DeleteObject
(
hdib
);
pbmi
->
bmiHeader
.
biBitCount
=
4
;
for
(
i
=
0
;
i
<
16
;
i
++
)
{
pbmi
->
bmiColors
[
i
].
rgbRed
=
i
;
pbmi
->
bmiColors
[
i
].
rgbGreen
=
16
-
i
;
pbmi
->
bmiColors
[
i
].
rgbBlue
=
0
;
}
hdib
=
CreateDIBSection
(
hdcmem
,
pbmi
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
ok
(
hdib
!=
NULL
,
"CreateDIBSection failed
\n
"
);
ok
(
GetObject
(
hdib
,
sizeof
(
DIBSECTION
),
&
dibsec
)
!=
0
,
"GetObject failed for DIB Section
\n
"
);
ok
(
dibsec
.
dsBmih
.
biClrUsed
==
16
,
"created DIBSection: wrong biClrUsed field: %lu, should be: %u
\n
"
,
dibsec
.
dsBmih
.
biClrUsed
,
16
);
DeleteObject
(
hdib
);
pbmi
->
bmiHeader
.
biBitCount
=
8
;
for
(
i
=
0
;
i
<
128
;
i
++
)
{
...
...
@@ -292,6 +309,10 @@ static void test_dibsections(void)
}
hdib
=
CreateDIBSection
(
hdcmem
,
pbmi
,
DIB_RGB_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
ok
(
hdib
!=
NULL
,
"CreateDIBSection failed
\n
"
);
ok
(
GetObject
(
hdib
,
sizeof
(
DIBSECTION
),
&
dibsec
)
!=
0
,
"GetObject failed for DIB Section
\n
"
);
ok
(
dibsec
.
dsBmih
.
biClrUsed
==
256
,
"created DIBSection: wrong biClrUsed field: %lu, should be: %u
\n
"
,
dibsec
.
dsBmih
.
biClrUsed
,
256
);
oldbm
=
SelectObject
(
hdcmem
,
hdib
);
for
(
i
=
0
;
i
<
256
;
i
++
)
{
...
...
@@ -322,6 +343,9 @@ static void test_dibsections(void)
oldpal
=
SelectPalette
(
hdc
,
hpal
,
TRUE
);
hdib
=
CreateDIBSection
(
hdc
,
pbmi
,
DIB_PAL_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
ok
(
hdib
!=
NULL
,
"CreateDIBSection failed
\n
"
);
ok
(
GetObject
(
hdib
,
sizeof
(
DIBSECTION
),
&
dibsec
)
!=
0
,
"GetObject failed for DIB Section
\n
"
);
ok
(
dibsec
.
dsBmih
.
biClrUsed
==
2
,
"created DIBSection: wrong biClrUsed field: %lu, should be: %u
\n
"
,
dibsec
.
dsBmih
.
biClrUsed
,
2
);
/* The colour table has already been grabbed from the dc, so we select back the
old palette */
...
...
@@ -409,6 +433,9 @@ static void test_dibsections(void)
oldpal
=
SelectPalette
(
hdc
,
hpal
,
TRUE
);
hdib
=
CreateDIBSection
(
hdc
,
pbmi
,
DIB_PAL_COLORS
,
(
void
**
)
&
bits
,
NULL
,
0
);
ok
(
hdib
!=
NULL
,
"CreateDIBSection failed
\n
"
);
ok
(
GetObject
(
hdib
,
sizeof
(
DIBSECTION
),
&
dibsec
)
!=
0
,
"GetObject failed for DIB Section
\n
"
);
ok
(
dibsec
.
dsBmih
.
biClrUsed
==
256
,
"created DIBSection: wrong biClrUsed field: %lu, should be: %u
\n
"
,
dibsec
.
dsBmih
.
biClrUsed
,
256
);
SelectPalette
(
hdc
,
oldpal
,
TRUE
);
oldbm
=
SelectObject
(
hdcmem
,
hdib
);
...
...
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