Jacek Caban : gdi32: Move GdiRealizationInfo to text.c.
Alexandre Julliard
julliard at winehq.org
Mon Aug 30 15:53:53 CDT 2021
Module: wine
Branch: master
Commit: 62a9bae480259fec4d2f4d09149a60cd238eb77a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a9bae480259fec4d2f4d09149a60cd238eb77a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Aug 30 13:55:12 2021 +0200
gdi32: Move GdiRealizationInfo to text.c.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdi32/font.c | 29 -----------------------------
dlls/gdi32/text.c | 25 +++++++++++++++++++++++++
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index de3787988d8..7ba6b3466c4 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -6807,35 +6807,6 @@ BOOL WINAPI NtGdiGetFontFileInfo( DWORD instance_id, DWORD file_index, struct fo
return ret;
}
-struct realization_info
-{
- DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */
- DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */
- DWORD instance_id; /* identifies a realized font instance */
-};
-
-/*************************************************************
- * GdiRealizationInfo (GDI32.@)
- *
- * Returns a structure that contains some font information.
- */
-BOOL WINAPI GdiRealizationInfo(HDC hdc, struct realization_info *info)
-{
- struct font_realization_info ri;
- BOOL ret;
-
- ri.size = sizeof(ri);
- ret = NtGdiGetRealizationInfo( hdc, &ri );
- if (ret)
- {
- info->flags = ri.flags;
- info->cache_num = ri.cache_num;
- info->instance_id = ri.instance_id;
- }
-
- return ret;
-}
-
/*************************************************************
* NtGdiGetCharWidthInfo (win32u.@)
*/
diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c
index 22c67e79c71..117f5921c9d 100644
--- a/dlls/gdi32/text.c
+++ b/dlls/gdi32/text.c
@@ -1977,3 +1977,28 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD file_index, UINT64 offset,
{
return NtGdiGetFontFileData( instance_id, file_index, &offset, buff, buff_size );
}
+
+struct realization_info
+{
+ DWORD flags; /* 1 for bitmap fonts, 3 for scalable fonts */
+ DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */
+ DWORD instance_id; /* identifies a realized font instance */
+};
+
+/*************************************************************
+ * GdiRealizationInfo (GDI32.@)
+ *
+ * Returns a structure that contains some font information.
+ */
+BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info )
+{
+ struct font_realization_info ri;
+
+ ri.size = sizeof(ri);
+ if (!NtGdiGetRealizationInfo( hdc, &ri )) return FALSE;
+
+ info->flags = ri.flags;
+ info->cache_num = ri.cache_num;
+ info->instance_id = ri.instance_id;
+ return TRUE;
+}
More information about the wine-cvs
mailing list