August 2021 - Wine-devel - list.winehq.org

[PATCH] include/wuapi: Add WindowsUpdateAgentInfo coclass and interface.
by Gijs Vermeulen 27 Aug '21

27 Aug '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- include/wuapi.idl | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/wuapi.idl b/include/wuapi.idl index a0a8e4359a9..67045232636 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1320,6 +1320,22 @@ interface ISystemInformation : IDispatch [out, retval] VARIANT_BOOL *retval); } +[ + object, + uuid(85713fa1-7796-4fa2-be3b-e2d6124dd373), + oleautomation, + dual, + nonextensible, + pointer_default(unique), + hidden +] +interface IWindowsUpdateAgentInfo : IDispatch +{ + [id(0x60020001)] + HRESULT GetInfo([in] VARIANT varInfoIdentifier, + [out, retval] VARIANT *retval); +} + [ helpstring("AutomaticUpdates Class"), threading(both), @@ -1356,4 +1372,13 @@ coclass UpdateSession { interface IUpdateSession; } ] coclass SystemInformation { interface ISystemInformation; } +[ + helpstring("WindowsUpdateAgentInfo Class"), + threading(both), + progid("Microsoft.Update.AgentInfo.1"), + vi_progid("Microsoft.Update.AgentInfo"), + uuid(c2e88c2f-6f5b-4aaa-894b-55c847ad3a2d) +] +coclass WindowsUpdateAgentInfo { interface IWindowsUpdateAgentInfo; } + } /* WUApiLib */ -- 2.33.0

1 0

[PATCH v2 9/9] gdi32: Use ntgdi name for GetFontData.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 5 ++--- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/uniscribe/opentype.c | 6 +++--- dlls/gdi32/uniscribe/shape.c | 12 ++++++------ dlls/gdi32/uniscribe/usp10.c | 4 ++-- include/ntgdi.h | 1 + 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b65f1e54bee..c5e36ef584b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6045,7 +6045,7 @@ BOOL WINAPI TranslateCharsetInfo( } /************************************************************************* - * GetFontData [GDI32.@] + * NtGdiGetFontData (win32u.@) * * Retrieve data for TrueType font. * @@ -6059,8 +6059,7 @@ BOOL WINAPI TranslateCharsetInfo( * Calls SetLastError() * */ -DWORD WINAPI GetFontData(HDC hdc, DWORD table, DWORD offset, - LPVOID buffer, DWORD length) +DWORD WINAPI NtGdiGetFontData( HDC hdc, DWORD table, DWORD offset, void *buffer, DWORD length ) { DC *dc = get_dc_ptr(hdc); PHYSDEV dev; diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 7862a5c3077..309e9e1ccbe 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -289,7 +289,7 @@ # @ stub GetEnhMetaFilePixelFormat @ stdcall GetEnhMetaFileW(wstr) # @ stub GetFontAssocStatus -@ stdcall GetFontData(long long long ptr long) +@ stdcall GetFontData(long long long ptr long) NtGdiGetFontData @ stdcall GetFontFileData(long long int64 ptr long) @ stdcall GetFontFileInfo(long long ptr long ptr) @ stdcall GetFontLanguageInfo(long) diff --git a/dlls/gdi32/uniscribe/opentype.c b/dlls/gdi32/uniscribe/opentype.c index a6ce76072d9..a6dbc6c4d28 100644 --- a/dlls/gdi32/uniscribe/opentype.c +++ b/dlls/gdi32/uniscribe/opentype.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "winuser.h" #include "winnls.h" #include "usp10.h" @@ -632,11 +632,11 @@ static VOID *load_CMAP_format12_table(HDC hdc, ScriptCache *psc) if (!psc->CMAP_Table) { - length = GetFontData(hdc, CMAP_TAG , 0, NULL, 0); + length = NtGdiGetFontData(hdc, CMAP_TAG , 0, NULL, 0); if (length != GDI_ERROR) { psc->CMAP_Table = heap_alloc(length); - GetFontData(hdc, CMAP_TAG , 0, psc->CMAP_Table, length); + NtGdiGetFontData(hdc, CMAP_TAG , 0, psc->CMAP_Table, length); TRACE("Loaded cmap table of %i bytes\n",length); } else diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c index d65476f67b4..709924597d3 100644 --- a/dlls/gdi32/uniscribe/shape.c +++ b/dlls/gdi32/uniscribe/shape.c @@ -669,11 +669,11 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach static VOID *load_gsub_table(HDC hdc) { VOID* GSUB_Table = NULL; - int length = GetFontData(hdc, MS_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, 0); + int length = NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, 0); if (length != GDI_ERROR) { GSUB_Table = heap_alloc(length); - GetFontData(hdc, MS_MAKE_TAG('G', 'S', 'U', 'B'), 0, GSUB_Table, length); + NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'S', 'U', 'B'), 0, GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); } return GSUB_Table; @@ -682,11 +682,11 @@ static VOID *load_gsub_table(HDC hdc) static VOID *load_gpos_table(HDC hdc) { VOID* GPOS_Table = NULL; - int length = GetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, NULL, 0); + int length = NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, NULL, 0); if (length != GDI_ERROR) { GPOS_Table = heap_alloc(length); - GetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, GPOS_Table, length); + NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, GPOS_Table, length); TRACE("Loaded GPOS table of %i bytes\n",length); } return GPOS_Table; @@ -695,11 +695,11 @@ static VOID *load_gpos_table(HDC hdc) static VOID *load_gdef_table(HDC hdc) { VOID* GDEF_Table = NULL; - int length = GetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, NULL, 0); + int length = NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, NULL, 0); if (length != GDI_ERROR) { GDEF_Table = heap_alloc(length); - GetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, GDEF_Table, length); + NtGdiGetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, GDEF_Table, length); TRACE("Loaded GDEF table of %i bytes\n",length); } return GDEF_Table; diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index 50f38f957b2..32fae22c816 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -30,7 +30,7 @@ #include "windef.h" #include "winbase.h" -#include "wingdi.h" +#include "ntgdi.h" #include "winuser.h" #include "winnls.h" #include "winreg.h" @@ -822,7 +822,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) sc->otm->otmSize = size; GetOutlineTextMetricsW(hdc, size, sc->otm); } - sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); + sc->sfnt = (NtGdiGetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0) != GDI_ERROR); if (!set_cache_font_properties(hdc, sc)) { heap_free(sc); diff --git a/include/ntgdi.h b/include/ntgdi.h index f9ad9da2060..995c2017b55 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -242,6 +242,7 @@ BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ); +DWORD WINAPI NtGdiGetFontData( HDC hdc, DWORD table, DWORD offset, void *buffer, DWORD length ); DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, DWORD size, void *buffer, const MAT2 *mat2, BOOL ignore_rotation ); -- 2.23.0

1 0

[PATCH v2 8/9] gdi32: Move GetFontLanguageInfo to text.c.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 49 ----------------------------------------------- dlls/gdi32/text.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index f825562b37f..b65f1e54bee 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6044,55 +6044,6 @@ BOOL WINAPI TranslateCharsetInfo( return TRUE; } -/************************************************************************* - * GetFontLanguageInfo (GDI32.@) - */ -DWORD WINAPI GetFontLanguageInfo(HDC hdc) -{ - FONTSIGNATURE fontsig; - static const DWORD GCP_DBCS_MASK=FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, - GCP_DIACRITIC_MASK=0x00000000, - FLI_GLYPHS_MASK=0x00000000, - GCP_GLYPHSHAPE_MASK=FS_ARABIC, - GCP_KASHIDA_MASK=0x00000000, - GCP_LIGATE_MASK=0x00000000, - GCP_REORDER_MASK=FS_HEBREW|FS_ARABIC; - - DWORD result=0; - - NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 ); - /* We detect each flag we return using a bitmask on the Codepage Bitfields */ - - if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) - result|=GCP_DBCS; - - if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) - result|=GCP_DIACRITIC; - - if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) - result|=FLI_GLYPHS; - - if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) - result|=GCP_GLYPHSHAPE; - - if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) - result|=GCP_KASHIDA; - - if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) - result|=GCP_LIGATE; - - if( NtGdiGetKerningPairsW( hdc, 0, NULL ) ) - result|=GCP_USEKERNING; - - /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ - if( GetTextAlign( hdc) & TA_RTLREADING ) - if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) - result|=GCP_REORDER; - - return result; -} - - /************************************************************************* * GetFontData [GDI32.@] * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index ba86a1a3b1d..72b721a48a2 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1849,3 +1849,51 @@ DWORD WINAPI GetKerningPairsA( HDC hdc, DWORD count, KERNINGPAIR *kern_pairA ) HeapFree( GetProcessHeap(), 0, kern_pairW ); return kern_pairs_copied; } + +/************************************************************************* + * GetFontLanguageInfo (GDI32.@) + */ +DWORD WINAPI GetFontLanguageInfo( HDC hdc ) +{ + FONTSIGNATURE fontsig; + DWORD result = 0; + + static const DWORD GCP_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB, + GCP_DIACRITIC_MASK = 0x00000000, + FLI_GLYPHS_MASK = 0x00000000, + GCP_GLYPHSHAPE_MASK = FS_ARABIC, + GCP_KASHIDA_MASK = 0x00000000, + GCP_LIGATE_MASK = 0x00000000, + GCP_REORDER_MASK = FS_HEBREW|FS_ARABIC; + + + NtGdiGetTextCharsetInfo( hdc, &fontsig, 0 ); + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + + if (fontsig.fsCsb[0] & GCP_DBCS_MASK) + result |= GCP_DBCS; + + if (fontsig.fsCsb[0] & GCP_DIACRITIC_MASK) + result |= GCP_DIACRITIC; + + if (fontsig.fsCsb[0] & FLI_GLYPHS_MASK) + result |= FLI_GLYPHS; + + if (fontsig.fsCsb[0] & GCP_GLYPHSHAPE_MASK) + result |= GCP_GLYPHSHAPE; + + if (fontsig.fsCsb[0] & GCP_KASHIDA_MASK) + result |= GCP_KASHIDA; + + if (fontsig.fsCsb[0] & GCP_LIGATE_MASK) + result |= GCP_LIGATE; + + if (NtGdiGetKerningPairsW( hdc, 0, NULL )) + result |= GCP_USEKERNING; + + /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ + if ((GetTextAlign( hdc ) & TA_RTLREADING) && (fontsig.fsCsb[0] & GCP_REORDER_MASK)) + result |= GCP_REORDER; + + return result; +} -- 2.23.0

1 0

[PATCH v2 7/9] gdi32: Use NtGdiGetKerningPairsW for GetKerningPairsW.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 82 +++++-------------------------------------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 67 +++++++++++++++++++++++++++++++++-- include/ntgdi.h | 5 +-- 4 files changed, 77 insertions(+), 79 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 12d56de35d9..f825562b37f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5976,93 +5976,27 @@ done: } /************************************************************************* - * GetKerningPairsA (GDI32.@) + * NtGdiGetKerningPairsW (win32u.@) */ -DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, - LPKERNINGPAIR kern_pairA ) -{ - UINT cp; - CPINFO cpi; - DWORD i, total_kern_pairs, kern_pairs_copied = 0; - KERNINGPAIR *kern_pairW; - - if (!cPairs && kern_pairA) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - cp = GdiGetCodePage(hDC); - - /* GetCPInfo() will fail on CP_SYMBOL, and WideCharToMultiByte is supposed - * to fail on an invalid character for CP_SYMBOL. - */ - cpi.DefaultChar[0] = 0; - if (cp != CP_SYMBOL && !GetCPInfo(cp, &cpi)) - { - FIXME("Can't find codepage %u info\n", cp); - return 0; - } - - total_kern_pairs = GetKerningPairsW(hDC, 0, NULL); - if (!total_kern_pairs) return 0; - - kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW)); - GetKerningPairsW(hDC, total_kern_pairs, kern_pairW); - - for (i = 0; i < total_kern_pairs; i++) - { - char first, second; - - if (!WideCharToMultiByte(cp, 0, &kern_pairW[i].wFirst, 1, &first, 1, NULL, NULL)) - continue; - - if (!WideCharToMultiByte(cp, 0, &kern_pairW[i].wSecond, 1, &second, 1, NULL, NULL)) - continue; - - if (first == cpi.DefaultChar[0] || second == cpi.DefaultChar[0]) - continue; - - if (kern_pairA) - { - if (kern_pairs_copied >= cPairs) break; - - kern_pairA->wFirst = (BYTE)first; - kern_pairA->wSecond = (BYTE)second; - kern_pairA->iKernAmount = kern_pairW[i].iKernAmount; - kern_pairA++; - } - kern_pairs_copied++; - } - - HeapFree(GetProcessHeap(), 0, kern_pairW); - - return kern_pairs_copied; -} - -/************************************************************************* - * GetKerningPairsW (GDI32.@) - */ -DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, - LPKERNINGPAIR lpKerningPairs ) +DWORD WINAPI NtGdiGetKerningPairsW( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ) { DC *dc; DWORD ret; PHYSDEV dev; - TRACE("(%p,%d,%p)\n", hDC, cPairs, lpKerningPairs); + TRACE( "(%p,%d,%p)\n", hdc, count, kern_pair ); - if (!cPairs && lpKerningPairs) + if (!count && kern_pair) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } - dc = get_dc_ptr(hDC); + dc = get_dc_ptr( hdc ); if (!dc) return 0; dev = GET_DC_PHYSDEV( dc, pGetKerningPairs ); - ret = dev->funcs->pGetKerningPairs( dev, cPairs, lpKerningPairs ); + ret = dev->funcs->pGetKerningPairs( dev, count, kern_pair ); release_dc_ptr( dc ); return ret; } @@ -6147,7 +6081,7 @@ DWORD WINAPI GetFontLanguageInfo(HDC hdc) if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) result|=GCP_LIGATE; - if( GetKerningPairsW( hdc, 0, NULL ) ) + if( NtGdiGetKerningPairsW( hdc, 0, NULL ) ) result|=GCP_USEKERNING; /* this might need a test for a HEBREW- or ARABIC_CHARSET as well */ diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 5bddcd26de6..7862a5c3077 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -309,7 +309,7 @@ @ stdcall GetICMProfileW(long ptr ptr) @ stdcall GetKerningPairs(long long ptr) GetKerningPairsA @ stdcall GetKerningPairsA(long long ptr) -@ stdcall GetKerningPairsW(long long ptr) +@ stdcall GetKerningPairsW(long long ptr) NtGdiGetKerningPairsW @ stdcall GetLayout(long) @ stdcall GetLogColorSpaceA(long ptr long) @ stdcall GetLogColorSpaceW(long ptr long) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 7e9b882bdb1..ba86a1a3b1d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1049,7 +1049,7 @@ static int *kern_string( HDC hdc, const WCHAR *str, int len, int *kern_total ) ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(*ret) ); if (!ret) return NULL; - count = GetKerningPairsW( hdc, 0, NULL ); + count = NtGdiGetKerningPairsW( hdc, 0, NULL ); if (count) { kern = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*kern) ); @@ -1059,7 +1059,7 @@ static int *kern_string( HDC hdc, const WCHAR *str, int len, int *kern_total ) return NULL; } - GetKerningPairsW( hdc, count, kern ); + NtGdiGetKerningPairsW( hdc, count, kern ); } for (i = 0; i < len - 1; i++) @@ -1786,3 +1786,66 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metr { return NtGdiGetGlyphOutlineW( hdc, ch, format, metrics, size, buffer, mat2, FALSE ); } + +/************************************************************************* + * GetKerningPairsA (GDI32.@) + */ +DWORD WINAPI GetKerningPairsA( HDC hdc, DWORD count, KERNINGPAIR *kern_pairA ) +{ + DWORD i, total_kern_pairs, kern_pairs_copied = 0; + KERNINGPAIR *kern_pairW; + CPINFO cpi; + UINT cp; + + if (!count && kern_pairA) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + cp = GdiGetCodePage( hdc ); + + /* GetCPInfo() will fail on CP_SYMBOL, and WideCharToMultiByte is supposed + * to fail on an invalid character for CP_SYMBOL. + */ + cpi.DefaultChar[0] = 0; + if (cp != CP_SYMBOL && !GetCPInfo( cp, &cpi )) + { + FIXME( "Can't find codepage %u info\n", cp ); + return 0; + } + + total_kern_pairs = NtGdiGetKerningPairsW( hdc, 0, NULL ); + if (!total_kern_pairs) return 0; + + kern_pairW = HeapAlloc( GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW) ); + NtGdiGetKerningPairsW( hdc, total_kern_pairs, kern_pairW ); + + for (i = 0; i < total_kern_pairs; i++) + { + char first, second; + + if (!WideCharToMultiByte( cp, 0, &kern_pairW[i].wFirst, 1, &first, 1, NULL, NULL )) + continue; + + if (!WideCharToMultiByte( cp, 0, &kern_pairW[i].wSecond, 1, &second, 1, NULL, NULL )) + continue; + + if (first == cpi.DefaultChar[0] || second == cpi.DefaultChar[0]) + continue; + + if (kern_pairA) + { + if (kern_pairs_copied >= count) break; + + kern_pairA->wFirst = (BYTE)first; + kern_pairA->wSecond = (BYTE)second; + kern_pairA->iKernAmount = kern_pairW[i].iKernAmount; + kern_pairA++; + } + kern_pairs_copied++; + } + + HeapFree( GetProcessHeap(), 0, kern_pairW ); + return kern_pairs_copied; +} diff --git a/include/ntgdi.h b/include/ntgdi.h index c8958cf83c9..f9ad9da2060 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -225,6 +225,8 @@ BOOL WINAPI NtGdiFillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ); INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size, const char *input, INT output_size, char *output ); BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type ); +BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, + const WCHAR *str, UINT count, const INT *dx, DWORD cp ); BOOL WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush, INT width, INT height ); BOOL WINAPI NtGdiFillPath( HDC hdc ); @@ -243,8 +245,7 @@ BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ); DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, DWORD size, void *buffer, const MAT2 *mat2, BOOL ignore_rotation ); -BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, - const WCHAR *str, UINT count, const INT *dx, DWORD cp ); +DWORD WINAPI NtGdiGetKerningPairsW( HDC hdc, DWORD count, KERNINGPAIR *kern_pair ); BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color ); UINT WINAPI NtGdiGetNearestPaletteIndex( HPALETTE hpalette, COLORREF color ); -- 2.23.0

1 0

[PATCH v2 6/9] gdi32: Use NtGdiGetGlyphOutlineW for GetGlyphOutlineW.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 50 +++++++---------------------------------------- dlls/gdi32/text.c | 44 +++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 3 +++ 3 files changed, 54 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 59438939474..12d56de35d9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5646,61 +5646,25 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars /*********************************************************************** - * GetGlyphOutlineA (GDI32.@) + * NtGdiGetGlyphOutlineW (win32u.@) */ -DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, - LPGLYPHMETRICS lpgm, DWORD cbBuffer, - LPVOID lpBuffer, const MAT2 *lpmat2 ) -{ - if (!lpmat2) return GDI_ERROR; - - if(!(fuFormat & GGO_GLYPH_INDEX)) { - UINT cp; - int len; - char mbchs[2]; - WCHAR wChar; - - cp = GdiGetCodePage(hdc); - if (IsDBCSLeadByteEx(cp, uChar >> 8)) { - len = 2; - mbchs[0] = (uChar & 0xff00) >> 8; - mbchs[1] = (uChar & 0xff); - } else { - len = 1; - mbchs[0] = (uChar & 0xff); - } - wChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); - uChar = wChar; - } - - return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, - lpmat2); -} - -/*********************************************************************** - * GetGlyphOutlineW (GDI32.@) - */ -DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, - LPGLYPHMETRICS lpgm, DWORD cbBuffer, - LPVOID lpBuffer, const MAT2 *lpmat2 ) +DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, + DWORD size, void *buffer, const MAT2 *mat2, + BOOL ignore_rotation ) { DC *dc; DWORD ret; PHYSDEV dev; - TRACE("(%p, %04x, %04x, %p, %d, %p, %p)\n", - hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); + TRACE( "(%p, %04x, %04x, %p, %d, %p, %p)\n", hdc, ch, format, metrics, size, buffer, mat2 ); - if (!lpmat2) return GDI_ERROR; + if (!mat2) return GDI_ERROR; dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; - uChar &= 0xffff; - dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); - ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); + ret = dev->funcs->pGetGlyphOutline( dev, ch & 0xffff, format, metrics, size, buffer, mat2 ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index beb9908f6ce..7e9b882bdb1 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1742,3 +1742,47 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT first, UINT count, WORD *glyphs, AB NTGDI_GETCHARABCWIDTHS_INDICES | NTGDI_GETCHARABCWIDTHS_INT, buffer ); } + +/*********************************************************************** + * GetGlyphOutlineA (GDI32.@) + */ +DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, DWORD size, + void *buffer, const MAT2 *mat2 ) +{ + if (!mat2) return GDI_ERROR; + + if (!(format & GGO_GLYPH_INDEX)) + { + UINT cp; + int len; + char mbchs[2]; + WCHAR wChar; + + cp = GdiGetCodePage( hdc ); + if (IsDBCSLeadByteEx( cp, ch >> 8 )) + { + len = 2; + mbchs[0] = (ch & 0xff00) >> 8; + mbchs[1] = (ch & 0xff); + } + else + { + len = 1; + mbchs[0] = ch & 0xff; + } + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1 ); + ch = wChar; + } + + return GetGlyphOutlineW( hdc, ch, format, metrics, size, buffer, mat2 ); +} + +/*********************************************************************** + * GetGlyphOutlineW (GDI32.@) + */ +DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, + DWORD size, void *buffer, const MAT2 *mat2 ) +{ + return NtGdiGetGlyphOutlineW( hdc, ch, format, metrics, size, buffer, mat2, FALSE ); +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 39f478bd418..c8958cf83c9 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -240,6 +240,9 @@ BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap ); BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr ); +DWORD WINAPI NtGdiGetGlyphOutlineW( HDC hdc, UINT ch, UINT format, GLYPHMETRICS *metrics, + DWORD size, void *buffer, const MAT2 *mat2, + BOOL ignore_rotation ); BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, const WCHAR *str, UINT count, const INT *dx, DWORD cp ); BOOL WINAPI NtGdiGetMiterLimit( HDC hdc, FLOAT *limit ); -- 2.23.0

1 0

[PATCH v2 5/9] gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatA.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 88 ----------------------------------------------- dlls/gdi32/text.c | 15 ++++++++ 2 files changed, 15 insertions(+), 88 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 07dcb77627a..59438939474 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4813,60 +4813,6 @@ UINT WINAPI NtGdiGetOutlineTextMetricsInternalW( HDC hdc, UINT cbData, return ret; } -static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT pByteLen) -{ - INT i, count = lastChar - firstChar + 1; - UINT mbcp; - UINT c; - LPSTR str; - - if (count <= 0) - return NULL; - - mbcp = GdiGetCodePage(hdc); - switch (mbcp) - { - case 932: - case 936: - case 949: - case 950: - case 1361: - if (lastChar > 0xffff) - return NULL; - if ((firstChar ^ lastChar) > 0xff) - return NULL; - break; - default: - if (lastChar > 0xff) - return NULL; - mbcp = 0; - break; - } - - str = HeapAlloc(GetProcessHeap(), 0, count * 2 + 1); - if (str == NULL) - return NULL; - - for(i = 0, c = firstChar; c <= lastChar; i++, c++) - { - if (mbcp) { - if (c > 0xff) - str[i++] = (BYTE)(c >> 8); - if (c <= 0xff && IsDBCSLeadByteEx(mbcp, c)) - str[i] = 0x1f; /* FIXME: use default character */ - else - str[i] = (BYTE)c; - } - else - str[i] = (BYTE)c; - } - str[i] = '\0'; - - *pByteLen = i; - - return str; -} - /*********************************************************************** * NtGdiGetCharWidthW (win32u.@) */ @@ -6320,40 +6266,6 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count, return ret; } -/************************************************************************* - * GetCharABCWidthsFloatA [GDI32.@] - * - * See GetCharABCWidthsFloatW. - */ -BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) -{ - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = FONT_GetCharsByRangeA(hdc, first, last, &i); - if (str == NULL) - return FALSE; - - wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); - - for (i = 0; i < wlen; i++) - { - if (!GetCharABCWidthsFloatW( hdc, wstr[i], wstr[i], abcf )) - { - ret = FALSE; - break; - } - abcf++; - } - - HeapFree( GetProcessHeap(), 0, str ); - HeapFree( GetProcessHeap(), 0, wstr ); - - return ret; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index a119615e002..beb9908f6ce 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1717,6 +1717,21 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, ABCFLOAT *ab return NtGdiGetCharABCWidthsW( hdc, first, last, NULL, 0, abcf ); } +/*********************************************************************** + * GetCharABCWidthsFloatA (GDI32.@) + */ +BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, ABCFLOAT *abcf ) +{ + WCHAR *chars; + INT count; + BOOL ret; + + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharABCWidthsW( hdc, 0, count, chars, 0, abcf ); + HeapFree( GetProcessHeap(), 0, chars ); + return ret; +} + /*********************************************************************** * GetCharABCWidthsI (GDI32.@) */ -- 2.23.0

1 0

[PATCH v2 4/9] gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatW.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 91 ++++++++++++++++------------------------------- dlls/gdi32/text.c | 9 +++++ 2 files changed, 39 insertions(+), 61 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e9071a571e3..07dcb77627a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5650,12 +5650,15 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars } else { - /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */ - dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) + if (flags & NTGDI_GETCHARABCWIDTHS_INT) { - release_dc_ptr( dc ); - return FALSE; + /* unlike float variant, this one is supposed to fail on non-scalable fonts */ + dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) + { + release_dc_ptr( dc ); + return FALSE; + } } if (!chars) count = last - first + 1; @@ -5666,13 +5669,29 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars if (ret) { ABC *abc = buffer; - /* convert device units to logical */ - for (i = 0; i < count; i++) + if (flags & NTGDI_GETCHARABCWIDTHS_INT) { - abc[i].abcA = width_to_LP( dc, abc[i].abcA ); - abc[i].abcB = width_to_LP( dc, abc[i].abcB ); - abc[i].abcC = width_to_LP( dc, abc[i].abcC ); - } + /* convert device units to logical */ + for (i = 0; i < count; i++) + { + abc[i].abcA = width_to_LP( dc, abc[i].abcA ); + abc[i].abcB = width_to_LP( dc, abc[i].abcB ); + abc[i].abcC = width_to_LP( dc, abc[i].abcC ); + } + } + else + { + /* convert device units to logical */ + FLOAT scale = fabs( dc->xformVport2World.eM11 ); + ABCFLOAT *abcf = buffer; + + for (i = 0; i < count; i++) + { + abcf[i].abcfA = abc[i].abcA * scale; + abcf[i].abcfB = abc[i].abcB * scale; + abcf[i].abcfC = abc[i].abcC * scale; + } + } } release_dc_ptr( dc ); @@ -6335,56 +6354,6 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a return ret; } -/************************************************************************* - * GetCharABCWidthsFloatW [GDI32.@] - * - * Retrieves widths of a range of characters. - * - * PARAMS - * hdc [I] Handle to device context. - * first [I] First character in range to query. - * last [I] Last character in range to query. - * abcf [O] Array of LPABCFLOAT structures. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) -{ - UINT i; - ABC *abc; - PHYSDEV dev; - BOOL ret = FALSE; - DC *dc = get_dc_ptr( hdc ); - - TRACE("%p, %d, %d, %p\n", hdc, first, last, abcf); - - if (!dc) return FALSE; - - if (!abcf) goto done; - if (!(abc = HeapAlloc( GetProcessHeap(), 0, (last - first + 1) * sizeof(*abc) ))) goto done; - - dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); - ret = dev->funcs->pGetCharABCWidths( dev, first, last - first + 1, NULL, abc ); - if (ret) - { - /* convert device units to logical */ - FLOAT scale = fabs( dc->xformVport2World.eM11 ); - for (i = first; i <= last; i++, abcf++) - { - abcf->abcfA = abc[i - first].abcA * scale; - abcf->abcfB = abc[i - first].abcB * scale; - abcf->abcfC = abc[i - first].abcC * scale; - } - } - HeapFree( GetProcessHeap(), 0, abc ); - -done: - release_dc_ptr( dc ); - return ret; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 1238a8f9f45..a119615e002 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1708,6 +1708,15 @@ BOOL WINAPI GetCharABCWidthsA( HDC hdc, UINT first, UINT last, ABC *abc ) return ret; } +/*********************************************************************** + * GetCharABCWidthsFloatW (GDI32.@) + */ +BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, ABCFLOAT *abcf ) +{ + TRACE( "%p, %d, %d, %p\n", hdc, first, last, abcf ); + return NtGdiGetCharABCWidthsW( hdc, first, last, NULL, 0, abcf ); +} + /*********************************************************************** * GetCharABCWidthsI (GDI32.@) */ -- 2.23.0

1 0

[PATCH v2 3/9] gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsI.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 82 ++++++++++++----------------------------------- dlls/gdi32/text.c | 11 +++++++ 2 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d67f5f66467..e9071a571e3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4886,7 +4886,9 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, if (!(abc = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ABC)))) return FALSE; - if (!GetCharABCWidthsI( hdc, first, last, chars, abc )) + if (!NtGdiGetCharABCWidthsW( hdc, first, last, chars, + NTGDI_GETCHARABCWIDTHS_INT | NTGDI_GETCHARABCWIDTHS_INDICES, + abc )) { HeapFree( GetProcessHeap(), 0, abc ); return FALSE; @@ -5641,18 +5643,26 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars return FALSE; } - if (!chars) count = last - first + 1; - - /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */ - dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); - if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) + if (flags & NTGDI_GETCHARABCWIDTHS_INDICES) { - release_dc_ptr( dc ); - return FALSE; + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidthsI ); + ret = dev->funcs->pGetCharABCWidthsI( dev, first, count, chars, buffer ); + } + else + { + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */ + dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); + if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) + { + release_dc_ptr( dc ); + return FALSE; + } + + if (!chars) count = last - first + 1; + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); + ret = dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer ); } - dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); - ret = dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer ); if (ret) { ABC *abc = buffer; @@ -5670,58 +5680,6 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars } -/****************************************************************************** - * GetCharABCWidthsI [GDI32.@] - * - * Retrieves widths of characters in range. - * - * PARAMS - * hdc [I] Handle of device context - * firstChar [I] First glyphs in range to query - * count [I] Last glyphs in range to query - * pgi [i] Array of glyphs to query - * abc [O] Address of character-width structure - * - * NOTES - * Only works with TrueType fonts - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, - LPWORD pgi, LPABC abc) -{ - DC *dc = get_dc_ptr(hdc); - PHYSDEV dev; - unsigned int i; - BOOL ret; - - if (!dc) return FALSE; - - if (!abc) - { - release_dc_ptr( dc ); - return FALSE; - } - - dev = GET_DC_PHYSDEV( dc, pGetCharABCWidthsI ); - ret = dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, abc ); - if (ret) - { - /* convert device units to logical */ - for( i = 0; i < count; i++, abc++ ) { - abc->abcA = width_to_LP(dc, abc->abcA); - abc->abcB = width_to_LP(dc, abc->abcB); - abc->abcC = width_to_LP(dc, abc->abcC); - } - } - - release_dc_ptr( dc ); - return ret; -} - - /*********************************************************************** * GetGlyphOutlineA (GDI32.@) */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 469a74cc808..1238a8f9f45 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1707,3 +1707,14 @@ BOOL WINAPI GetCharABCWidthsA( HDC hdc, UINT first, UINT last, ABC *abc ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharABCWidthsI (GDI32.@) + */ +BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT first, UINT count, WORD *glyphs, ABC *buffer ) +{ + TRACE( "(%p, %d, %d, %p, %p)\n", hdc, first, count, glyphs, buffer ); + return NtGdiGetCharABCWidthsW( hdc, first, count, glyphs, + NTGDI_GETCHARABCWIDTHS_INDICES | NTGDI_GETCHARABCWIDTHS_INT, + buffer ); +} -- 2.23.0

1 0

[PATCH v2 2/9] gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsA.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/driver.c | 3 +- dlls/gdi32/font.c | 76 +++++++++++---------------------------- dlls/gdi32/text.c | 17 +++++++++ include/wine/gdi_driver.h | 4 +-- 4 files changed, 42 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 3d64eedc638..a5ba3ad4ea7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -370,7 +370,8 @@ static UINT CDECL nulldrv_GetBoundsRect( PHYSDEV dev, RECT *rect, UINT flags ) return DCB_RESET; } -static BOOL CDECL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT last, LPABC abc ) +static BOOL CDECL nulldrv_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, + WCHAR *chars, ABC *abc ) { return FALSE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 261f2389285..d67f5f66467 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3040,22 +3040,26 @@ static BOOL CDECL font_FontIsLinked( PHYSDEV dev ) /************************************************************* * font_GetCharABCWidths */ -static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT last, ABC *buffer ) +static BOOL CDECL font_GetCharABCWidths( PHYSDEV dev, UINT first, UINT count, + WCHAR *chars, ABC *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); - UINT c; + UINT c, i; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidths ); - return dev->funcs->pGetCharABCWidths( dev, first, last, buffer ); + return dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer ); } - TRACE( "%p, %u, %u, %p\n", physdev->font, first, last, buffer ); + TRACE( "%p, %u, %u, %p\n", physdev->font, first, count, buffer ); EnterCriticalSection( &font_cs ); - for (c = first; c <= last; c++, buffer++) - get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, buffer, 0, NULL, NULL ); + for (i = 0; i < count; i++) + { + c = chars ? chars[i] : first + i; + get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &buffer[i], 0, NULL, NULL ); + } LeaveCriticalSection( &font_cs ); return TRUE; } @@ -5606,47 +5610,6 @@ BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) } -/*********************************************************************** - * GetCharABCWidthsA (GDI32.@) - * - * See GetCharABCWidthsW. - */ -BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, - LPABC abc ) -{ - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = FONT_GetCharsByRangeA(hdc, firstChar, lastChar, &i); - if (str == NULL) - return FALSE; - - wstr = FONT_mbtowc(hdc, str, i, &wlen, NULL); - if (wstr == NULL) - { - HeapFree(GetProcessHeap(), 0, str); - return FALSE; - } - - for(i = 0; i < wlen; i++) - { - if(!GetCharABCWidthsW(hdc, wstr[i], wstr[i], abc)) - { - ret = FALSE; - break; - } - abc++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; -} - - /****************************************************************************** * NtGdiGetCharABCWidthsW (win32u.@) * @@ -5661,12 +5624,12 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, * NOTES * Only works with TrueType fonts */ -BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, +BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars, ULONG flags, void *buffer ) { DC *dc = get_dc_ptr(hdc); PHYSDEV dev; - unsigned int i; + unsigned int i, count = last; BOOL ret; TEXTMETRICW tm; @@ -5678,6 +5641,8 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, WCHA return FALSE; } + if (!chars) count = last - first + 1; + /* unlike GetCharABCWidthsFloatW, this one is supposed to fail on non-scalable fonts */ dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); if (!dev->funcs->pGetTextMetrics( dev, &tm ) || !(tm.tmPitchAndFamily & TMPF_VECTOR)) @@ -5687,15 +5652,16 @@ BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, WCHA } dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); - ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, buffer ); + ret = dev->funcs->pGetCharABCWidths( dev, first, count, chars, buffer ); if (ret) { ABC *abc = buffer; /* convert device units to logical */ - for( i = firstChar; i <= lastChar; i++, abc++ ) { - abc->abcA = width_to_LP(dc, abc->abcA); - abc->abcB = width_to_LP(dc, abc->abcB); - abc->abcC = width_to_LP(dc, abc->abcC); + for (i = 0; i < count; i++) + { + abc[i].abcA = width_to_LP( dc, abc[i].abcA ); + abc[i].abcB = width_to_LP( dc, abc[i].abcB ); + abc[i].abcC = width_to_LP( dc, abc[i].abcC ); } } @@ -6442,7 +6408,7 @@ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT a if (!(abc = HeapAlloc( GetProcessHeap(), 0, (last - first + 1) * sizeof(*abc) ))) goto done; dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); - ret = dev->funcs->pGetCharABCWidths( dev, first, last, abc ); + ret = dev->funcs->pGetCharABCWidths( dev, first, last - first + 1, NULL, abc ); if (ret) { /* convert device units to logical */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 5f1930cf4a5..469a74cc808 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1690,3 +1690,20 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT first, UINT last, ABC *abc ) { return NtGdiGetCharABCWidthsW( hdc, first, last, NULL, NTGDI_GETCHARABCWIDTHS_INT, abc ); } + +/*********************************************************************** + * GetCharABCWidthsA (GDI32.@) + * + * See GetCharABCWidthsW. + */ +BOOL WINAPI GetCharABCWidthsA( HDC hdc, UINT first, UINT last, ABC *abc ) +{ + WCHAR *chars; + INT count; + BOOL ret; + + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharABCWidthsW( hdc, 0, count, chars, NTGDI_GETCHARABCWIDTHS_INT, abc ); + HeapFree( GetProcessHeap(), 0, chars ); + return ret; +} diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 6db6cf94b70..a5af0bd6eb7 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -97,7 +97,7 @@ struct gdi_dc_funcs BOOL (CDECL *pFontIsLinked)(PHYSDEV); BOOL (CDECL *pFrameRgn)(PHYSDEV,HRGN,HBRUSH,INT,INT); UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); - BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); + BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,WCHAR*,LPABC); BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); BOOL (CDECL *pGetCharWidthInfo)(PHYSDEV,void*); @@ -169,7 +169,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 65 +#define WINE_GDI_DRIVER_VERSION 66 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ -- 2.23.0

1 0

[PATCH v2 1/9] gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsW.
by Huw Davies 27 Aug '21

27 Aug '21

From: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/font.c | 15 ++++++--------- dlls/gdi32/text.c | 8 ++++++++ include/ntgdi.h | 6 +++++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e80143066b5..261f2389285 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5648,7 +5648,7 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, /****************************************************************************** - * GetCharABCWidthsW [GDI32.@] + * NtGdiGetCharABCWidthsW (win32u.@) * * Retrieves widths of characters in range. * @@ -5660,13 +5660,9 @@ BOOL WINAPI GetCharABCWidthsA(HDC hdc, UINT firstChar, UINT lastChar, * * NOTES * Only works with TrueType fonts - * - * RETURNS - * Success: TRUE - * Failure: FALSE */ -BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, - LPABC abc ) +BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, + ULONG flags, void *buffer ) { DC *dc = get_dc_ptr(hdc); PHYSDEV dev; @@ -5676,7 +5672,7 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, if (!dc) return FALSE; - if (!abc) + if (!buffer) { release_dc_ptr( dc ); return FALSE; @@ -5691,9 +5687,10 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, } dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); - ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); + ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, buffer ); if (ret) { + ABC *abc = buffer; /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, abc++ ) { abc->abcA = width_to_LP(dc, abc->abcA); diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index c3d72938eba..5f1930cf4a5 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1682,3 +1682,11 @@ BOOL WINAPI GetCharWidthI( HDC hdc, UINT first, UINT count, WORD *glyphs, INT *b return NtGdiGetCharWidthW( hdc, first, count, glyphs, NTGDI_GETCHARWIDTH_INT | NTGDI_GETCHARWIDTH_INDICES, buffer ); } + +/*********************************************************************** + * GetCharABCWidthsW (GDI32.@) + */ +BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT first, UINT last, ABC *abc ) +{ + return NtGdiGetCharABCWidthsW( hdc, first, last, NULL, NTGDI_GETCHARABCWIDTHS_INT, abc ); +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 7d95c186c8f..39f478bd418 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -126,6 +126,9 @@ enum #define NTGDI_GETCHARWIDTH_INT 0x02 #define NTGDI_GETCHARWIDTH_INDICES 0x08 +#define NTGDI_GETCHARABCWIDTHS_INT 0x01 +#define NTGDI_GETCHARABCWIDTHS_INDICES 0x02 + #define MWT_SET 4 /* structs not compatible with native Windows */ @@ -229,7 +232,8 @@ BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect ); BOOL WINAPI NtGdiGetBitmapDimension( HBITMAP bitmap, SIZE *size ); UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags ); -BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first_char, UINT last_char, ABC *abc ); +BOOL WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *chars, + ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars, ULONG flags, void *buffer ); BOOL WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result ); -- 2.23.0

1 0