Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
85b42085
Commit
85b42085
authored
Oct 16, 2013
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Oct 16, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32/tests: Fix DIB tests compilation with __WINESRC__ defined.
parent
120ee4e0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
dib.c
dlls/gdi32/tests/dib.c
+8
-8
No files found.
dlls/gdi32/tests/dib.c
View file @
85b42085
...
...
@@ -2720,17 +2720,17 @@ static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
static
void
draw_text_2
(
HDC
hdc
,
BITMAPINFO
*
bmi
,
BYTE
*
bits
,
BOOL
aa
)
{
DWORD
dib_size
=
get_dib_size
(
bmi
),
ret
;
LOGFONT
lf
;
LOGFONT
A
lf
;
HFONT
font
;
GLYPHMETRICS
gm
;
BYTE
g_buf
[
10000
];
int
i
,
stride
,
x
,
y
;
static
const
MAT2
identity
=
{
{
0
,
1
},
{
0
,
0
},
{
0
,
0
},
{
0
,
1
}
};
char
*
eto_hash
=
NULL
,
*
diy_hash
=
NULL
;
static
const
char
*
str
=
"Hello Wine"
;
static
const
char
str
[]
=
"Hello Wine"
;
POINT
origin
,
g_org
;
static
const
BYTE
vals
[
4
]
=
{
0x00
,
0x00
,
0x00
,
0x00
};
TEXTMETRIC
tm
;
TEXTMETRIC
A
tm
;
COLORREF
text_color
;
for
(
i
=
0
;
i
<
dib_size
;
i
++
)
...
...
@@ -2741,10 +2741,10 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa )
lf
.
lfHeight
=
24
;
lf
.
lfQuality
=
aa
?
ANTIALIASED_QUALITY
:
NONANTIALIASED_QUALITY
;
font
=
CreateFontIndirect
(
&
lf
);
font
=
CreateFontIndirect
A
(
&
lf
);
font
=
SelectObject
(
hdc
,
font
);
GetTextMetrics
(
hdc
,
&
tm
);
GetTextMetrics
A
(
hdc
,
&
tm
);
if
(
!
(
tm
.
tmPitchAndFamily
&
TMPF_VECTOR
))
{
skip
(
"skipping as a bitmap font has been selected for Tahoma.
\n
"
);
...
...
@@ -2758,7 +2758,7 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa )
origin
.
x
=
10
;
origin
.
y
=
100
;
ExtTextOut
(
hdc
,
origin
.
x
,
origin
.
y
,
0
,
NULL
,
str
,
strlen
(
str
),
NULL
);
ExtTextOut
A
(
hdc
,
origin
.
x
,
origin
.
y
,
0
,
NULL
,
str
,
strlen
(
str
),
NULL
);
eto_hash
=
hash_dib
(
bmi
,
bits
);
for
(
i
=
0
;
i
<
dib_size
;
i
++
)
...
...
@@ -2771,11 +2771,11 @@ static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa )
{
DWORD
ggo_flags
=
aa
?
GGO_GRAY4_BITMAP
:
GGO_BITMAP
;
ret
=
GetGlyphOutline
(
hdc
,
str
[
i
],
ggo_flags
,
&
gm
,
0
,
NULL
,
&
identity
);
ret
=
GetGlyphOutline
A
(
hdc
,
str
[
i
],
ggo_flags
,
&
gm
,
0
,
NULL
,
&
identity
);
if
(
ret
==
GDI_ERROR
)
continue
;
if
(
ret
)
GetGlyphOutline
(
hdc
,
str
[
i
],
ggo_flags
,
&
gm
,
sizeof
(
g_buf
),
g_buf
,
&
identity
);
if
(
ret
)
GetGlyphOutline
A
(
hdc
,
str
[
i
],
ggo_flags
,
&
gm
,
sizeof
(
g_buf
),
g_buf
,
&
identity
);
g_org
.
x
=
origin
.
x
+
gm
.
gmptGlyphOrigin
.
x
;
g_org
.
y
=
origin
.
y
-
gm
.
gmptGlyphOrigin
.
y
;
...
...
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