79d8ed4849
gdi32: Avoid crash by initializing variable font_set.
...
If the call pFcStrListNext returns NULL the loop is never entered and
the variable font_set never gets written, leading to a crash cleaning
up font_set by pFcFontSetDestroy.
Signed-off-by: Bernhard Übelacker <bernhardu@mailbox.org>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-24 16:59:26 +01:00
f7e646ccb7
gdi32: Lazily create and cache fontconfig patterns.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-20 19:01:04 +01:00
a51d68e35c
gdi32: Load font list directly from fontconfig cache.
...
Instead of going through the -slow- font matching.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-20 19:01:04 +01:00
d05e2bcaf6
gdi32: Move FreeType face creation to AddFaceToList.
...
So we can use it to add individual fontconfig fonts without iterating
all faces. And rename it to add_unix_face.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-20 19:01:04 +01:00
37c72ce2d6
gdi32: Ignore Type 1 fonts in fontconfig enumeration.
...
Instead of loading the font with FreeType to discard it right away.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-20 19:01:04 +01:00
236fa496da
gdi32/uniscribe: Use wide-char string literals.
...
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-16 11:25:18 +01:00
c475e5b40c
gdi32: Rewrite find_any_face using the rbtree.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-13 13:13:19 +01:00
ec646de3aa
gdi32: Rewrite find_face_from_filename using the rbtree.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-13 13:13:16 +01:00
5cdd011f4e
gdi32: Index font families by name in an rbtree.
...
Keeping them sorted with the vertical / default family rules.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-13 13:13:12 +01:00
ca96e04637
gdi32/tests: Fix a compiler warning.
...
Signed-off-by: Sven Baars <sbaars@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-12 13:58:53 +01:00
abd0cddc5f
gdi32: Avoid exceeding the actual bitmap height.
...
The bottom-up case is handled earlier on. For the top-down
case, 'lines' is left untouched.
Signed-off-by: Haoyang Chen <chenhaoyang@uniontech.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-12 13:58:33 +01:00
dd51cd8d00
gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.
...
Signed-off-by: Francois Gouget <fgouget@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-10 17:19:44 +01:00
b9178da586
gdi32: Merge in Uniscribe functionality.
...
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-09 20:15:11 +01:00
cb1ff768ac
gdi32: Implement GdiDllInitialize stub.
...
This is required by several Call of Duty games that are calling this
directly after loading gdi32.dll from disk.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48171
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 18:20:32 +01:00
308a0cf72d
gdi32: Fix font rendering issue when child font is used.
...
Otherwise, freetype_get_glyph_outline() fails at FT_Load_Glyph due to
combination of base_font's ft_face and child font's glyph index.
Fixes a regression introduced by 044315c0b3
2020-11-06 17:34:27 +01:00
a56487732e
gdi32: Initialize the font gamma ramp with the other font options.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 17:34:27 +01:00
b1d920bb9f
gdi32: Use wide-character string literals.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-06 17:34:27 +01:00
aa90a5969f
gdi32: Build with msvcrt.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:44:16 +01:00
60ef5b0182
gdi32: Move OSMesa support to the Unix library.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:41:12 +01:00
3cfafab38b
gdi32: Move FreeType support to a new Unix library.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:32:04 +01:00
54a01ea1ec
gdi32: Use ntdll functions for heap allocations.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:31:02 +01:00
013f1033c0
gdi32: Use ntdll functions for locale support.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:30:56 +01:00
acc1f6545f
gdi32: Use ntdll functions for DOS<->Unix path conversions.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:30:50 +01:00
8db165000d
gdi32: Use ntdll functions for codepage conversions.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:06:26 +01:00
fd9e1612d9
gdi32: Use FT_MulDiv() instead of the kernel32 function.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 10:01:32 +01:00
8768f60527
gdi32: Store scale as an integer.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 09:59:32 +01:00
fe6bb5f723
gdi32: Don't abort enumeration if a font fails to load.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-05 09:59:22 +01:00
e1b193d8ba
gdi32: Make a few definitions private to font.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
53acdd5a8a
gdi32: Move the SelectFont() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
3b87839ec9
gdi32: Move the rest of the font matching code out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
4cddf0d47d
gdi32: Move the handling of font family fallbacks out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
caf0b9c082
gdi32: Add some helper functions for font matching.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
6c5dc58a82
gdi32: Move the remove_font() function out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-04 21:11:44 +01:00
000e32f183
gdi32: Update the Windows font registry keys only when they have changed.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 14:53:34 +01:00
a6f0349e84
gdi32: Add a helper function to create a face.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 14:53:34 +01:00
19d13d0004
gdi32: Move the font cache out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:26:39 +01:00
a84c60ed2a
gdi32: Add a separate backend function to load the font list.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:26:12 +01:00
fc44dcdd03
gdi32: Move the font list reordering out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:25:47 +01:00
de63a647d5
gdi32: Move the default AA flags handling out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-03 11:25:30 +01:00
356ad03fcf
gdi32: Move the font enumeration out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
c9b21a5707
gdi32: Add a helper function to create a font from a face.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
ef77b38888
gdi32: Move the dumping of the font list out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:23 +01:00
8d4336c5fa
gdi32: Move the creation of the child font list out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-11-02 16:01:22 +01:00
bc19adf474
gdi32: Move the font link support out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-31 18:33:33 +01:00
74ea8d8c42
gdi32: Make the family replacement point to the family object.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 14:40:11 +01:00
d27a9d77ee
gdi32: Move the loading of font replacements out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 14:40:11 +01:00
5537f38e97
gdi32: Move the face data structure out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 14:35:47 +01:00
6a1cdd98fa
gdi32: Move the font family list out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 14:22:51 +01:00
7e51cc8308
gdi32: Move the font substitution list out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-30 14:15:55 +01:00
402281b668
gdi32: Add a helper to get the FreeType face and cleanup private data.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:12 +01:00
044315c0b3
gdi32: Move the glyph index mapping for GetGlyphOutline() out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 20:19:12 +01:00
54bdbd3c03
gdi32: Store child font objects directly on the child font list.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 15:39:29 +01:00
8631506270
gdi32: Move the GSUB table support out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-29 15:39:18 +01:00
72272d0088
gdi32: Move part of the GetCharWidthInfo() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 10:14:01 +01:00
3749449943
gdi32: Move part of the GetFontUnicodeRanges() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-28 10:13:53 +01:00
ed9114c118
gdi32: Move the CreateScalableFontResource() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 14:26:06 +01:00
5772b064ac
gdi32: Allocate the backend font data in the load_font() helper.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 14:25:32 +01:00
0bf2c11d43
gdi32: Add a helper to load a font without using a face.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 14:10:41 +01:00
7b291a094d
gdi32: Move the loading of filesystem fonts out of freetype.c.
...
The fonts Path value now expects DOS paths.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 10:27:32 +01:00
2c1a42bc67
gdi32: Move the loading of registry fonts out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 10:27:20 +01:00
131d3b1f5d
gdi32: Move the loading of system fonts out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-27 10:27:06 +01:00
f6d9908e48
gdi32: Move the AddFontMemResourceEx() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 12:05:19 +01:00
047bf25223
gdi32: Move the Add/RemoveFontResource() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 12:04:36 +01:00
f3a75923a6
gdi32: Move the fonts directory helper functions out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 12:03:21 +01:00
df335e3405
gdi32: Move the kerning pairs data into the generic font structure.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 11:50:07 +01:00
e0872b6424
gdi32: Move the text metrics cache into the generic font structure.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 11:43:24 +01:00
a89595a259
gdi32: Set the font file name directly at creation time.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-26 11:37:03 +01:00
a13492b376
gdi32: Don't bother caching the font type.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-23 20:16:53 +02:00
5bdc6e0fe6
gdi32: Move the GetGlyphIndices() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 22:02:02 +02:00
2d15ea5012
gdi32: Move the GetFontFileData() implementation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 11:57:48 +02:00
a3b08dd3f3
gdi32: Move the get_glyph_outline() helper to the font function interface.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 11:56:47 +02:00
26f8b4a7bc
gdi32: Move the font critical section out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 11:54:35 +02:00
b3d55e2ce5
gdi32: Move the glyph metrics cache out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 11:51:07 +02:00
c44c347dd5
gdi32: Move more font metrics information to the generic font structure.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-22 11:49:33 +02:00
35f5e65197
gdi32: Move the font realization information out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:05:28 +02:00
6c94c0b04f
gdi32: Move the font charset information out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:04:35 +02:00
ecba0d2bbb
gdi32: Move the font name information out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:03:51 +02:00
d26462b52a
gdi32: Move the font file information out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:02:48 +02:00
82c140f1a6
gdi32: Move the font cache list out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 11:01:50 +02:00
d7a54394d4
gdi32: Move the realized font handle allocation out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-21 10:59:51 +02:00
3e7f8aa272
gdi32: Move the other exported freetype functions to the font backend table.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
46ab536f87
gdi32: Move the font driver out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-20 22:54:02 +02:00
b6c099cda6
gdi32: Store face data as a single binary value in the registry cache.
...
This is faster than a bunch of separate string values.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-06 21:47:55 +02:00
14395c8535
gdi32: Compare DOS filenames instead of Unix stat information for font files.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-06 16:34:02 +02:00
f51fe9ead3
gdi32: Store the face filename as a DOS path.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-10-06 15:33:39 +02:00
29d35db9a5
gdi32: Move font codepage setup out of freetype.c.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-30 16:08:21 +02:00
45aee6375d
gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
...
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400
Signed-off-by: Arkadiusz Hiler <ahiler@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-29 12:01:57 +02:00
2370e7b9a1
gdi32: Share font_gamma_ramp structure between all DCs.
...
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-24 16:41:24 +02:00
a404eb7272
gdi32: Use explicit CDECL in gdi_image_bits.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-22 11:29:54 +02:00
d560182624
gdi32: Look for another secondary font family name.
...
If English is the current locale, or if the primary langid does not
have a name in the font (in which case the English name is used), look
for another non-English name.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-21 12:54:36 +02:00
d3ba3ca2d0
gdi32/tests: Add test fonts with names in several languages.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-21 12:54:30 +02:00
a204ad557d
makefiles: Expand makedep path at compile time.
...
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-09 20:30:31 +02:00
74357b7d97
gdi32: Compare full name before discarding faces.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
68ad3162f0
gdi32: Use fixed size array for family and english name.
...
This stops stealing pointer ownership, and will also make sure the TRACE
messages contain the truncated family names, that are actually compared.
Also rename the fields to make them consistent with most Wine internal
coding style.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
a968b1f668
gdi32: Rename StyleName to style_name for consistency.
...
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
f360057e2f
gdi32: Build full name from family + style when missing.
...
Also add full name in TRACE messages. The gdi32 family not always
matches the real font family, as we match only LF_FACESIZE chars, so it
could make traces confusing.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
cc6951574a
gdi32: Rewrite prepend_at helper as get_vertical_name.
...
And only prepend '@'' if it's not already there.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
01d82af4a3
gdi32: Introduce ft_face_get_family/style_name helpers.
...
And use them directly instead of get_family_names.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
afc857436a
gdi32/tests: Test extended TTF font names and collisions.
...
This shows that although Windows is only matching family names up to
LF_FACESIZE chars, and that it doesn't match against the preferred /
typographic family names and styles, it still keeps the faces separate
when the full names don't match. Wine incorrectly discard one of them.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-08 21:20:39 +02:00
e07eb13ae8
gdi32: Only trace new faces when they are added.
...
Instead of every time they don't match another face.
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2020-09-03 15:20:07 +02:00
Bernhard Übelacker