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
6164d533
Commit
6164d533
authored
Oct 30, 2012
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Add a parameter to return anti-aliasing flags in the SelectFont driver entry point.
parent
deeb14e0
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
17 additions
and
16 deletions
+17
-16
driver.c
dlls/gdi32/driver.c
+1
-1
enhmetafiledrv.h
dlls/gdi32/enhmfdrv/enhmetafiledrv.h
+1
-1
objects.c
dlls/gdi32/enhmfdrv/objects.c
+2
-2
font.c
dlls/gdi32/font.c
+2
-1
freetype.c
dlls/gdi32/freetype.c
+1
-1
metafiledrv.h
dlls/gdi32/mfdrv/metafiledrv.h
+1
-1
objects.c
dlls/gdi32/mfdrv/objects.c
+1
-1
font.c
dlls/wineps.drv/font.c
+3
-3
psdrv.h
dlls/wineps.drv/psdrv.h
+1
-1
xrender.c
dlls/winex11.drv/xrender.c
+2
-2
gdi_driver.h
include/wine/gdi_driver.h
+2
-2
No files found.
dlls/gdi32/driver.c
View file @
6164d533
...
...
@@ -552,7 +552,7 @@ static HBRUSH nulldrv_SelectBrush( PHYSDEV dev, HBRUSH brush, const struct brush
return
brush
;
}
static
HFONT
nulldrv_SelectFont
(
PHYSDEV
dev
,
HFONT
font
)
static
HFONT
nulldrv_SelectFont
(
PHYSDEV
dev
,
HFONT
font
,
UINT
*
aa_flags
)
{
return
0
;
}
...
...
dlls/gdi32/enhmfdrv/enhmetafiledrv.h
View file @
6164d533
...
...
@@ -105,7 +105,7 @@ extern BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom,
extern
HBITMAP
EMFDRV_SelectBitmap
(
PHYSDEV
dev
,
HBITMAP
handle
)
DECLSPEC_HIDDEN
;
extern
HBRUSH
EMFDRV_SelectBrush
(
PHYSDEV
dev
,
HBRUSH
hbrush
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
BOOL
EMFDRV_SelectClipPath
(
PHYSDEV
dev
,
INT
iMode
)
DECLSPEC_HIDDEN
;
extern
HFONT
EMFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
handle
)
DECLSPEC_HIDDEN
;
extern
HFONT
EMFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
handle
,
UINT
*
aa_flags
)
DECLSPEC_HIDDEN
;
extern
HPEN
EMFDRV_SelectPen
(
PHYSDEV
dev
,
HPEN
handle
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
HPALETTE
EMFDRV_SelectPalette
(
PHYSDEV
dev
,
HPALETTE
hPal
,
BOOL
force
)
DECLSPEC_HIDDEN
;
extern
INT
EMFDRV_SetArcDirection
(
PHYSDEV
dev
,
INT
arcDirection
)
DECLSPEC_HIDDEN
;
...
...
dlls/gdi32/enhmfdrv/objects.c
View file @
6164d533
...
...
@@ -277,7 +277,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont )
/***********************************************************************
* EMFDRV_SelectFont
*/
HFONT
EMFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hFont
)
HFONT
EMFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hFont
,
UINT
*
aa_flags
)
{
EMFDRV_PDEVICE
*
physDev
=
(
EMFDRV_PDEVICE
*
)
dev
;
EMRSELECTOBJECT
emr
;
...
...
@@ -315,7 +315,7 @@ HFONT EMFDRV_SelectFont( PHYSDEV dev, HFONT hFont )
return
0
;
done:
dev
=
GET_NEXT_PHYSDEV
(
dev
,
pSelectFont
);
dev
->
funcs
->
pSelectFont
(
dev
,
hFont
);
dev
->
funcs
->
pSelectFont
(
dev
,
hFont
,
aa_flags
);
return
hFont
;
}
...
...
dlls/gdi32/font.c
View file @
6164d533
...
...
@@ -716,6 +716,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
HGDIOBJ
ret
=
0
;
DC
*
dc
=
get_dc_ptr
(
hdc
);
PHYSDEV
physdev
;
UINT
aa_flags
=
0
;
if
(
!
dc
)
return
0
;
...
...
@@ -726,7 +727,7 @@ static HGDIOBJ FONT_SelectObject( HGDIOBJ handle, HDC hdc )
}
physdev
=
GET_DC_PHYSDEV
(
dc
,
pSelectFont
);
if
(
physdev
->
funcs
->
pSelectFont
(
physdev
,
handle
))
if
(
physdev
->
funcs
->
pSelectFont
(
physdev
,
handle
,
&
aa_flags
))
{
ret
=
dc
->
hFont
;
dc
->
hFont
=
handle
;
...
...
dlls/gdi32/freetype.c
View file @
6164d533
...
...
@@ -4429,7 +4429,7 @@ static FT_Encoding pick_charmap( FT_Face face, int charset )
/*************************************************************
* freetype_SelectFont
*/
static
HFONT
freetype_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
)
static
HFONT
freetype_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
,
UINT
*
aa_flags
)
{
struct
freetype_physdev
*
physdev
=
get_freetype_dev
(
dev
);
GdiFont
*
ret
;
...
...
dlls/gdi32/mfdrv/metafiledrv.h
View file @
6164d533
...
...
@@ -105,7 +105,7 @@ extern BOOL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum,
extern
HBITMAP
MFDRV_SelectBitmap
(
PHYSDEV
dev
,
HBITMAP
handle
)
DECLSPEC_HIDDEN
;
extern
HBRUSH
MFDRV_SelectBrush
(
PHYSDEV
dev
,
HBRUSH
hbrush
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
BOOL
MFDRV_SelectClipPath
(
PHYSDEV
dev
,
INT
iMode
)
DECLSPEC_HIDDEN
;
extern
HFONT
MFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
handle
)
DECLSPEC_HIDDEN
;
extern
HFONT
MFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
handle
,
UINT
*
aa_flags
)
DECLSPEC_HIDDEN
;
extern
HPEN
MFDRV_SelectPen
(
PHYSDEV
dev
,
HPEN
handle
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
HPALETTE
MFDRV_SelectPalette
(
PHYSDEV
dev
,
HPALETTE
hPalette
,
BOOL
bForceBackground
)
DECLSPEC_HIDDEN
;
extern
UINT
MFDRV_RealizePalette
(
PHYSDEV
dev
,
HPALETTE
hPalette
,
BOOL
primary
)
DECLSPEC_HIDDEN
;
...
...
dlls/gdi32/mfdrv/objects.c
View file @
6164d533
...
...
@@ -285,7 +285,7 @@ static UINT16 MFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont, LOGFONTW *logfo
/***********************************************************************
* MFDRV_SelectFont
*/
HFONT
MFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
)
HFONT
MFDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
,
UINT
*
aa_flags
)
{
LOGFONTW
font
;
INT16
index
;
...
...
dlls/wineps.drv/font.c
View file @
6164d533
...
...
@@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
/***********************************************************************
* SelectFont (WINEPS.@)
*/
HFONT
PSDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
)
HFONT
PSDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
,
UINT
*
aa_flags
)
{
PSDRV_PDEVICE
*
physDev
=
get_psdrv_dev
(
dev
);
PHYSDEV
next
=
GET_NEXT_PHYSDEV
(
dev
,
pSelectFont
);
...
...
@@ -114,14 +114,14 @@ HFONT PSDRV_SelectFont( PHYSDEV dev, HFONT hfont )
physDev
->
font
.
escapement
=
lf
.
lfEscapement
;
physDev
->
font
.
set
=
FALSE
;
if
(
!
subst
&&
((
ret
=
next
->
funcs
->
pSelectFont
(
next
,
hfont
))))
if
(
!
subst
&&
((
ret
=
next
->
funcs
->
pSelectFont
(
next
,
hfont
,
aa_flags
))))
{
PSDRV_SelectDownloadFont
(
dev
);
return
ret
;
}
PSDRV_SelectBuiltinFont
(
dev
,
hfont
,
&
lf
,
FaceName
);
next
->
funcs
->
pSelectFont
(
next
,
0
);
/* tell next driver that we selected a device font */
next
->
funcs
->
pSelectFont
(
next
,
0
,
aa_flags
);
/* tell next driver that we selected a device font */
return
hfont
;
}
...
...
dlls/wineps.drv/psdrv.h
View file @
6164d533
...
...
@@ -444,7 +444,7 @@ extern BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bott
extern
BOOL
PSDRV_RoundRect
(
PHYSDEV
dev
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
,
INT
ell_width
,
INT
ell_height
)
DECLSPEC_HIDDEN
;
extern
HBRUSH
PSDRV_SelectBrush
(
PHYSDEV
dev
,
HBRUSH
hbrush
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
HFONT
PSDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
)
DECLSPEC_HIDDEN
;
extern
HFONT
PSDRV_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
,
UINT
*
aa_flags
)
DECLSPEC_HIDDEN
;
extern
HPEN
PSDRV_SelectPen
(
PHYSDEV
dev
,
HPEN
hpen
,
const
struct
brush_pattern
*
pattern
)
DECLSPEC_HIDDEN
;
extern
COLORREF
PSDRV_SetBkColor
(
PHYSDEV
dev
,
COLORREF
color
)
DECLSPEC_HIDDEN
;
extern
COLORREF
PSDRV_SetDCBrushColor
(
PHYSDEV
dev
,
COLORREF
color
)
DECLSPEC_HIDDEN
;
...
...
dlls/winex11.drv/xrender.c
View file @
6164d533
...
...
@@ -1036,12 +1036,12 @@ static void lfsz_calc_hash(LFANDSIZE *plfsz)
/**********************************************************************
* xrenderdrv_SelectFont
*/
static
HFONT
xrenderdrv_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
)
static
HFONT
xrenderdrv_SelectFont
(
PHYSDEV
dev
,
HFONT
hfont
,
UINT
*
aa_flags
)
{
LFANDSIZE
lfsz
;
struct
xrender_physdev
*
physdev
=
get_xrender_dev
(
dev
);
PHYSDEV
next
=
GET_NEXT_PHYSDEV
(
dev
,
pSelectFont
);
HFONT
ret
=
next
->
funcs
->
pSelectFont
(
next
,
hfont
);
HFONT
ret
=
next
->
funcs
->
pSelectFont
(
next
,
hfont
,
aa_flags
);
if
(
!
ret
)
return
0
;
...
...
include/wine/gdi_driver.h
View file @
6164d533
...
...
@@ -153,7 +153,7 @@ struct gdi_dc_funcs
HBITMAP
(
*
pSelectBitmap
)(
PHYSDEV
,
HBITMAP
);
HBRUSH
(
*
pSelectBrush
)(
PHYSDEV
,
HBRUSH
,
const
struct
brush_pattern
*
);
BOOL
(
*
pSelectClipPath
)(
PHYSDEV
,
INT
);
HFONT
(
*
pSelectFont
)(
PHYSDEV
,
HFONT
);
HFONT
(
*
pSelectFont
)(
PHYSDEV
,
HFONT
,
UINT
*
);
HPALETTE
(
*
pSelectPalette
)(
PHYSDEV
,
HPALETTE
,
BOOL
);
HPEN
(
*
pSelectPen
)(
PHYSDEV
,
HPEN
,
const
struct
brush_pattern
*
);
INT
(
*
pSetArcDirection
)(
PHYSDEV
,
INT
);
...
...
@@ -197,7 +197,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
#define WINE_GDI_DRIVER_VERSION 4
4
#define WINE_GDI_DRIVER_VERSION 4
5
#define GDI_PRIORITY_NULL_DRV 0
/* null driver */
#define GDI_PRIORITY_FONT_DRV 100
/* any font driver */
...
...
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