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
df041783
Commit
df041783
authored
May 05, 2023
by
Piotr Caban
Committed by
Alexandre Julliard
May 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineps: Copy GetTextMetrics implementation to unixlib.
parent
b1f7b0da
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
init.c
dlls/wineps.drv/init.c
+0
-1
unixlib.c
dlls/wineps.drv/unixlib.c
+16
-0
No files found.
dlls/wineps.drv/init.c
View file @
df041783
...
...
@@ -694,7 +694,6 @@ static struct gdi_dc_funcs psdrv_funcs =
.
pCreateDC
=
PSDRV_CreateDC
,
.
pDeleteDC
=
PSDRV_DeleteDC
,
.
pGetTextExtentExPoint
=
PSDRV_GetTextExtentExPoint
,
.
pGetTextMetrics
=
PSDRV_GetTextMetrics
,
.
priority
=
GDI_PRIORITY_GRAPHICS_DRV
};
...
...
dlls/wineps.drv/unixlib.c
View file @
df041783
...
...
@@ -1191,6 +1191,21 @@ static BOOL CDECL get_char_width(PHYSDEV dev, UINT first, UINT count, const WCHA
return
TRUE
;
}
static
BOOL
CDECL
get_text_metrics
(
PHYSDEV
dev
,
TEXTMETRICW
*
metrics
)
{
PSDRV_PDEVICE
*
pdev
=
get_psdrv_dev
(
dev
);
if
(
pdev
->
font
.
fontloc
==
Download
)
{
dev
=
GET_NEXT_PHYSDEV
(
dev
,
pGetTextMetrics
);
return
dev
->
funcs
->
pGetTextMetrics
(
dev
,
metrics
);
}
memcpy
(
metrics
,
&
(
pdev
->
font
.
fontinfo
.
Builtin
.
tm
),
sizeof
(
pdev
->
font
.
fontinfo
.
Builtin
.
tm
));
return
TRUE
;
}
static
NTSTATUS
init_dc
(
void
*
arg
)
{
struct
init_dc_params
*
params
=
arg
;
...
...
@@ -1201,6 +1216,7 @@ static NTSTATUS init_dc(void *arg)
params
->
funcs
->
pSelectFont
=
select_font
;
params
->
funcs
->
pEnumFonts
=
enum_fonts
;
params
->
funcs
->
pGetCharWidth
=
get_char_width
;
params
->
funcs
->
pGetTextMetrics
=
get_text_metrics
;
return
TRUE
;
}
...
...
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