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
8796831a
Commit
8796831a
authored
Oct 21, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Implement FontIsLinked as a standard driver entry point.
parent
e31c51b6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
12 deletions
+16
-12
font.c
dlls/gdi32/font.c
+4
-2
freetype.c
dlls/gdi32/freetype.c
+12
-9
gdi_private.h
dlls/gdi32/gdi_private.h
+0
-1
No files found.
dlls/gdi32/font.c
View file @
8796831a
...
...
@@ -3378,10 +3378,12 @@ DWORD WINAPI GetFontUnicodeRanges(HDC hdc, LPGLYPHSET lpgs)
BOOL
WINAPI
FontIsLinked
(
HDC
hdc
)
{
DC
*
dc
=
get_dc_ptr
(
hdc
);
BOOL
ret
=
FALSE
;
PHYSDEV
dev
;
BOOL
ret
;
if
(
!
dc
)
return
FALSE
;
if
(
dc
->
gdiFont
)
ret
=
WineEngFontIsLinked
(
dc
->
gdiFont
);
dev
=
GET_DC_PHYSDEV
(
dc
,
pFontIsLinked
);
ret
=
dev
->
funcs
->
pFontIsLinked
(
dev
);
release_dc_ptr
(
dc
);
TRACE
(
"returning %d
\n
"
,
ret
);
return
ret
;
...
...
dlls/gdi32/freetype.c
View file @
8796831a
...
...
@@ -6748,14 +6748,22 @@ static DWORD freetype_GetFontUnicodeRanges( PHYSDEV dev, LPGLYPHSET glyphset )
}
/*************************************************************
*
FontIsLinked
*
freetype_
FontIsLinked
*/
BOOL
WineEngFontIsLinked
(
GdiFont
*
font
)
static
BOOL
freetype_FontIsLinked
(
PHYSDEV
dev
)
{
struct
freetype_physdev
*
physdev
=
get_freetype_dev
(
dev
);
BOOL
ret
;
if
(
!
physdev
->
font
)
{
dev
=
GET_NEXT_PHYSDEV
(
dev
,
pFontIsLinked
);
return
dev
->
funcs
->
pFontIsLinked
(
dev
);
}
GDI_CheckNotLock
();
EnterCriticalSection
(
&
freetype_cs
);
ret
=
!
list_empty
(
&
font
->
child_fonts
);
ret
=
!
list_empty
(
&
physdev
->
font
->
child_fonts
);
LeaveCriticalSection
(
&
freetype_cs
);
return
ret
;
}
...
...
@@ -7130,7 +7138,7 @@ static const struct gdi_dc_funcs freetype_funcs =
NULL
,
/* pFillPath */
NULL
,
/* pFillRgn */
NULL
,
/* pFlattenPath */
NULL
,
/* pFontIsLinked */
freetype_FontIsLinked
,
/* pFontIsLinked */
NULL
,
/* pFrameRgn */
NULL
,
/* pGdiComment */
NULL
,
/* pGdiRealizationInfo */
...
...
@@ -7266,11 +7274,6 @@ BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph)
return
FALSE
;
}
BOOL
WineEngFontIsLinked
(
GdiFont
*
font
)
{
return
FALSE
;
}
/*************************************************************************
* GetRasterizerCaps (GDI32.@)
*/
...
...
dlls/gdi32/gdi_private.h
View file @
8796831a
...
...
@@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN;
extern
HANDLE
WineEngAddFontMemResourceEx
(
PVOID
,
DWORD
,
PVOID
,
LPDWORD
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngDestroyFontInstance
(
HFONT
handle
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngGetLinkedHFont
(
DC
*
dc
,
WCHAR
c
,
HFONT
*
new_hfont
,
UINT
*
glyph
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngFontIsLinked
(
GdiFont
*
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngInit
(
void
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngRealizationInfo
(
GdiFont
*
,
realization_info_t
*
)
DECLSPEC_HIDDEN
;
extern
BOOL
WineEngRemoveFontResourceEx
(
LPCWSTR
,
DWORD
,
PVOID
)
DECLSPEC_HIDDEN
;
...
...
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