March 2021 - Wine-Devel - list.winehq.org

[PATCH 1/3] comctl32: Fix DPA_GetPtr() prototype.
by Nikolay Sivov March 8, 2021

March 8, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/dpa.c | 6 +++--- dlls/comctl32/tests/dpa.c | 2 +- include/commctrl.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 36b3a422e8c..6dce9575b59 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -524,9 +524,9 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) * Success: pointer * Failure: NULL */ -LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT_PTR nIndex) { - TRACE("(%p %d)\n", hdpa, nIndex); + TRACE("(%p %ld)\n", hdpa, nIndex); if (!hdpa) return NULL; @@ -535,7 +535,7 @@ LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) return NULL; } if ((nIndex < 0) || (nIndex >= hdpa->nItemCount)) { - WARN("not enough pointers in array (%d vs %d).\n",nIndex,hdpa->nItemCount); + WARN("not enough pointers in array (%ld vs %d).\n",nIndex,hdpa->nItemCount); return NULL; } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index cbe3ab7fb2b..4a446a8e2c5 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -49,7 +49,7 @@ static PVOID (WINAPI *pDPA_DeletePtr)(HDPA,INT); static BOOL (WINAPI *pDPA_Destroy)(HDPA); static VOID (WINAPI *pDPA_DestroyCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); static VOID (WINAPI *pDPA_EnumCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); -static INT (WINAPI *pDPA_GetPtr)(HDPA,INT); +static PVOID (WINAPI *pDPA_GetPtr)(HDPA,INT_PTR); static INT (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); static INT (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID); diff --git a/include/commctrl.h b/include/commctrl.h index dfd2f4a37d2..97e2fcc4df0 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5170,7 +5170,7 @@ BOOL WINAPI DPA_Destroy(HDPA); LPVOID WINAPI DPA_DeletePtr(HDPA, INT); BOOL WINAPI DPA_DeleteAllPtrs(HDPA); BOOL WINAPI DPA_SetPtr(HDPA, INT, LPVOID); -LPVOID WINAPI DPA_GetPtr(HDPA, INT); +LPVOID WINAPI DPA_GetPtr(HDPA, INT_PTR); INT WINAPI DPA_GetPtrIndex(HDPA, LPCVOID); ULONGLONG WINAPI DPA_GetSize(HDPA); BOOL WINAPI DPA_Grow(HDPA, INT); -- 2.30.1

1 3

[PATCH 1/3] kernel32: Implement GetUserDefaultGeoName().
by Paul Gofman March 8, 2021

March 8, 2021

Fixes crash on launch in Outriders demo. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/locale.c | 50 +++++++++++++++++++++++++++++++++ include/winnls.h | 1 + 4 files changed, 53 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ee2e3f8ad31..5dee1d9b906 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -763,6 +763,7 @@ @ stdcall -import GetOEMCP() @ stdcall -import GetOverlappedResult(long ptr ptr long) @ stdcall -import GetOverlappedResultEx(long ptr ptr long long) +@ stdcall -import GetUserDefaultGeoName(ptr long) @ stdcall -import GetUserPreferredUILanguages(long ptr ptr ptr) @ stdcall GetPackageFamilyName(long ptr ptr) kernelbase.GetPackageFamilyName @ stdcall GetPackageFullName(long ptr ptr) kernelbase.GetPackageFullName diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 543961d2ce6..a0cd5f82a18 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -741,6 +741,7 @@ @ stub GetUILanguageInfo # @ stub GetUnicodeStringToEightBitSizeRoutine # @ stub GetUnicodeStringToEightBitStringRoutine +@ stdcall GetUserDefaultGeoName(ptr long) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultLocaleName(ptr long) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index b746feca639..7126dc74d01 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5740,6 +5740,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetUserGeoID( GEOID id ) const WCHAR *name = geoinfo->kind == LOCATION_NATION ? L"Nation" : L"Region"; swprintf( bufferW, ARRAY_SIZE(bufferW), L"%u", geoinfo->id ); RegSetValueExW( hkey, name, 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); + + if (geoinfo->kind == LOCATION_NATION || geoinfo->kind == LOCATION_BOTH) + lstrcpyW( bufferW, geoinfo->iso2W ); + else + swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03u", geoinfo->uncode ); + RegSetValueExW( hkey, L"Name", 0, REG_SZ, (BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR) ); RegCloseKey( hkey ); } return TRUE; @@ -5877,3 +5883,47 @@ INT WINAPI DECLSPEC_HOTPATCH WideCharToMultiByte( UINT codepage, DWORD flags, LP TRACE( "cp %d %s -> %s, ret = %d\n", codepage, debugstr_wn(src, srclen), debugstr_an(dst, ret), ret ); return ret; } + + +/*********************************************************************** + * GetUserDefaultGeoName (kernelbase.@) + */ +INT WINAPI GetUserDefaultGeoName(LPWSTR geo_name, int count) +{ + const struct geoinfo *geoinfo; + WCHAR buffer[32]; + LSTATUS status; + DWORD size; + HKEY key; + + TRACE( "geo_name %p, count %d.\n", geo_name, count ); + + if (count && !geo_name) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + if (!(status = RegOpenKeyExW( intl_key, L"Geo", 0, KEY_ALL_ACCESS, &key ))) + { + size = sizeof(buffer); + status = RegQueryValueExW( key, L"Name", NULL, NULL, (BYTE *)buffer, &size ); + RegCloseKey( key ); + } + if (status) + { + if ((geoinfo = get_geoinfo_ptr( GetUserGeoID( GEOCLASS_NATION ))) && geoinfo->id != 39070) + lstrcpyW( buffer, geoinfo->iso2W ); + else + lstrcpyW( buffer, L"001" ); + } + size = lstrlenW( buffer ) + 1; + if (count < size) + { + if (!count) + return size; + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + lstrcpyW( geo_name, buffer ); + return size; +} diff --git a/include/winnls.h b/include/winnls.h index 07a31cfde88..04838cfa8d7 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -946,6 +946,7 @@ WINBASEAPI INT WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR WINBASEAPI INT WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); WINBASEAPI INT WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,INT); #define GetTimeFormat WINELIB_NAME_AW(GetTimeFormat) +WINBASEAPI INT WINAPI GetUserDefaultGeoName(LPWSTR,int); WINBASEAPI LANGID WINAPI GetUserDefaultLangID(void); WINBASEAPI LCID WINAPI GetUserDefaultLCID(void); WINBASEAPI INT WINAPI GetUserDefaultLocaleName(LPWSTR,int); -- 2.29.2

1 2

[PATCH 1/6] wined3d: Introduce wined3d_device_get_immediate_context().
by Zebediah Figura March 8, 2021

March 8, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 06329293261..181f491546a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2054,6 +2054,13 @@ struct wined3d_state * CDECL wined3d_device_get_state(struct wined3d_device *dev return device->cs->c.state; } +struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struct wined3d_device *device) +{ + TRACE("device %p.\n", device); + + return &device->cs->c; +} + void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f1d477af703..f5fa1d3d7e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -84,6 +84,7 @@ @ cdecl wined3d_device_get_hs_resource_view(ptr long) @ cdecl wined3d_device_get_hs_sampler(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) +@ cdecl wined3d_device_get_immediate_context(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_max_frame_latency(ptr) @ cdecl wined3d_device_get_npatch_mode(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 030e3fdcb67..ba9e8642ea2 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2414,6 +2414,7 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_vie unsigned int idx); struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); +struct wined3d_device_context * __cdecl wined3d_device_get_immediate_context(struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset); unsigned int __cdecl wined3d_device_get_max_frame_latency(const struct wined3d_device *device); -- 2.20.1

5 12

[PATCH v3 5/5] gdi32: Remove needTransform variable of freetype_get_glyph_outline()
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 52 ++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 620fc62a96a..2535faad03a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2644,8 +2644,8 @@ enum matrices_index matrix_unrotated }; -static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, - FT_Matrix matrices[3] ) +static FT_Matrix *get_transform_matrices( struct gdi_font *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) { static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; BOOL needs_transform = FALSE; @@ -2744,7 +2744,7 @@ static BOOL get_transform_matrices( struct gdi_font *font, BOOL vertical, const needs_transform = TRUE; } - return needs_transform; + return needs_transform ? matrices : NULL; } static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) @@ -2841,12 +2841,11 @@ static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, return adv; } -static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, - BOOL needs_transform, const FT_Matrix metrices[3] ) +static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, const FT_Matrix *matrices ) { FT_BBox bbox = { 0, 0, 0, 0 }; - if (!needs_transform) + if (!matrices) { bbox.xMin = (metrics->horiBearingX) & -64; bbox.xMax = (metrics->horiBearingX + metrics->width + 63) & -64; @@ -2865,7 +2864,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); - pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if (xc == 0 && yc == 0) { bbox.xMin = bbox.xMax = vec.x; @@ -2891,14 +2890,13 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, } static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, - BOOL vertical, BOOL vertical_metrics, - BOOL needs_transform, const FT_Matrix matrices[3], + BOOL vertical, BOOL vertical_metrics, const FT_Matrix *matrices, GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; - if (!needs_transform) + if (!matrices) { adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; @@ -2972,7 +2970,7 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3020,7 +3018,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, ft_bitmap.pixel_mode = FT_PIXEL_MODE_MONO; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3038,7 +3036,7 @@ static DWORD get_mono_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, } static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3086,7 +3084,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT ft_bitmap.pixel_mode = FT_PIXEL_MODE_GRAY; ft_bitmap.buffer = buf; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate( &glyph->outline, -bbox.xMin, -bbox.yMin ); @@ -3116,7 +3114,7 @@ static DWORD get_antialias_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT } static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT format, - BOOL fake_bold, BOOL needs_transform, FT_Matrix matrices[3], + BOOL fake_bold, const FT_Matrix *matrices, GLYPHMETRICS *gm, DWORD buflen, BYTE *buf ) { DWORD width = (bbox.xMax - bbox.xMin ) >> 6; @@ -3194,7 +3192,7 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (!buf || !buflen) return needed; if (needed > buflen) return GDI_ERROR; - if (needs_transform) + if (matrices) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); pFT_Render_Glyph( glyph, render_mode ); @@ -3501,8 +3499,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph FT_Error err; FT_BBox bbox; FT_Int load_flags = get_load_flags(format); - FT_Matrix matrices[3]; - BOOL needsTransform = FALSE; + FT_Matrix transform_matrices[3], *matrices = NULL; BOOL vertical_metrics; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -3513,7 +3510,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph format &= ~GGO_UNHINTED; - needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); + matrices = get_transform_matrices( font, tategaki, lpmat, transform_matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only @@ -3521,7 +3518,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (vertical_metrics && FT_SimpleVersion < FT_VERSION_VALUE(2, 4, 0)) vertical_metrics = FALSE; - if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (matrices || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph, load_flags); @@ -3558,9 +3555,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, - lpgm, abc ); + bbox = get_transformed_bbox( &metrics, matrices ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, matrices, lpgm, abc ); switch (format) { @@ -3569,21 +3565,21 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph case GGO_BITMAP: return get_mono_glyph_bitmap( ft_face->glyph, bbox, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case GGO_GRAY2_BITMAP: case GGO_GRAY4_BITMAP: case GGO_GRAY8_BITMAP: case WINE_GGO_GRAY16_BITMAP: return get_antialias_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, buflen, buf ); + matrices, buflen, buf ); case WINE_GGO_HRGB_BITMAP: case WINE_GGO_HBGR_BITMAP: case WINE_GGO_VRGB_BITMAP: case WINE_GGO_VBGR_BITMAP: return get_subpixel_glyph_bitmap( ft_face->glyph, bbox, format, font->fake_bold, - needsTransform, matrices, lpgm, buflen, buf ); + matrices, lpgm, buflen, buf ); case GGO_NATIVE: if (ft_face->glyph->format == ft_glyph_format_outline) @@ -3593,7 +3589,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -3613,7 +3609,7 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph if (buflen == 0) buf = NULL; - if (needsTransform && buf) + if (matrices && buf) pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.23.0

1 0

[PATCH v3 4/5] gdi32: Remove metrics, vertical_metrics arguments of get_advance_metric().
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d858b2624e..620fc62a96a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,19 +2786,14 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics ) +static FT_Vector get_advance_metric( struct gdi_font *font, FT_Pos base_advance, + const FT_Matrix *transMat ) { FT_Vector adv; - FT_Fixed base_advance, em_scale = 0; + FT_Fixed em_scale = 0; BOOL fixed_pitch_full = FALSE; struct gdi_font *incoming_font = font->base_font ? font->base_font : font; - if (vertical_metrics) - base_advance = metrics->vertAdvance; - else - base_advance = metrics->horiAdvance; - adv.x = base_advance; adv.y = 0; @@ -2901,10 +2896,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph GLYPHMETRICS *gm, ABC *abc ) { FT_Vector adv, vec, origin; + FT_Fixed base_advance = vertical_metrics ? metrics->vertAdvance : metrics->horiAdvance; if (!needs_transform) { - adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, base_advance, NULL ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2937,11 +2933,11 @@ static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph lsb = metrics->horiBearingX; } - adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_hori] ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); + adv = get_advance_metric( font, base_advance, &matrices[matrix_unrotated] ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0; -- 2.23.0

1 0

[PATCH v3 3/5] gdi32: Remove incoming_font argument of get_advance_metric().
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e25d4f726d6..4d858b2624e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2786,13 +2786,13 @@ static inline BYTE get_max_level( UINT format ) return 255; } -static FT_Vector get_advance_metric(struct gdi_font *incoming_font, struct gdi_font *font, - const FT_Glyph_Metrics *metrics, - const FT_Matrix *transMat, BOOL vertical_metrics) +static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics, + const FT_Matrix *transMat, BOOL vertical_metrics ) { FT_Vector adv; FT_Fixed base_advance, em_scale = 0; BOOL fixed_pitch_full = FALSE; + struct gdi_font *incoming_font = font->base_font ? font->base_font : font; if (vertical_metrics) base_advance = metrics->vertAdvance; @@ -2895,8 +2895,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, return bbox; } -static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *font, - FT_BBox bbox, const FT_Glyph_Metrics *metrics, +static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics, BOOL vertical, BOOL vertical_metrics, BOOL needs_transform, const FT_Matrix matrices[3], GLYPHMETRICS *gm, ABC *abc ) @@ -2905,7 +2904,7 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo if (!needs_transform) { - adv = get_advance_metric( incoming_font, font, metrics, NULL, vertical_metrics ); + adv = get_advance_metric( font, metrics, NULL, vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = 0; origin.x = bbox.xMin; @@ -2938,13 +2937,11 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo lsb = metrics->horiBearingX; } - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_hori], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics ); gm->gmCellIncX = adv.x >> 6; gm->gmCellIncY = adv.y >> 6; - adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_unrotated], - vertical_metrics ); + adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics ); adv.x = pFT_Vector_Length( &adv ); adv.y = 0; @@ -3566,8 +3563,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph } bbox = get_transformed_bbox( &metrics, needsTransform, matrices ); - compute_metrics( base_font, font, bbox, &metrics, tategaki, - vertical_metrics, needsTransform, matrices, lpgm, abc ); + compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices, + lpgm, abc ); switch (format) { -- 2.23.0

1 0

[PATCH v3 2/5] gdi32: Fix typo in get_transformed_bbox() trace message.
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a2e31d4fb48..e25d4f726d6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2869,7 +2869,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, { vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; - TRACE( "Vec %ld,i %ld\n", vec.x, vec.y ); + TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); if (xc == 0 && yc == 0) { -- 2.23.0

1 0

[PATCH v3 1/5] gdi32: Move FT_Library_SetLcdFilter() to init_freetype().
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fae4aa94a78..a2e31d4fb48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1922,6 +1922,11 @@ static BOOL init_freetype(void) pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); } +#ifdef FT_LCD_FILTER_H + if (pFT_Library_SetLcdFilter) + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif + return TRUE; sym_not_found: @@ -3199,10 +3204,6 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (needs_transform) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); -#ifdef FT_LCD_FILTER_H - if (pFT_Library_SetLcdFilter) - pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); -#endif pFT_Render_Glyph( glyph, render_mode ); src_pitch = glyph->bitmap.pitch; -- 2.23.0

1 0

[PATCH v2 1/4] gdi32: Fix typo in get_transformed_bbox() trace message.
by Huw Davies March 8, 2021

March 8, 2021

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fae4aa94a78..d6cdaa12e98 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2864,7 +2864,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics, { vec.x = metrics->horiBearingX + xc * metrics->width; vec.y = metrics->horiBearingY - yc * metrics->height; - TRACE( "Vec %ld,i %ld\n", vec.x, vec.y ); + TRACE( "Vec %ld, %ld\n", vec.x, vec.y ); pFT_Vector_Transform( &vec, &metrices[matrix_vert] ); if (xc == 0 && yc == 0) { -- 2.23.0

1 1

[PATCH 1/5] gdi32: Move FT_Library_SetLcdFilter() to init_freetype().
by Byeongsik Jeon March 8, 2021

March 8, 2021

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index fae4aa94a78..a2e31d4fb48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1922,6 +1922,11 @@ static BOOL init_freetype(void) pFT_Property_Set( library, "truetype", "interpreter-version", &interpreter_version ); } +#ifdef FT_LCD_FILTER_H + if (pFT_Library_SetLcdFilter) + pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); +#endif + return TRUE; sym_not_found: @@ -3199,10 +3204,6 @@ static DWORD get_subpixel_glyph_bitmap( FT_GlyphSlot glyph, FT_BBox bbox, UINT f if (needs_transform) pFT_Outline_Transform( &glyph->outline, &matrices[matrix_vert] ); -#ifdef FT_LCD_FILTER_H - if (pFT_Library_SetLcdFilter) - pFT_Library_SetLcdFilter( library, FT_LCD_FILTER_DEFAULT ); -#endif pFT_Render_Glyph( glyph, render_mode ); src_pitch = glyph->bitmap.pitch; -- 2.30.0

2 5