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

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsA.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 78a935138e9e3b17f12be9297de4a9f44f5b5139 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a935138e9e3b17f12be929… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:49 2021 +0100 gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 */

1 0

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsI.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: ce9b1ddc1a561e998a4540496af52c9654cb2edc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9b1ddc1a561e998a454049… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:50 2021 +0100 gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsI. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 ); +}

1 0

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatW.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: fb5a3ba5410f9ee3927cdfb6a933ca80c2ddb68c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb5a3ba5410f9ee3927cdfb6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:51 2021 +0100 gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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.@) */

1 0

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatA.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 9fe27a704da943b833e0fcc7b6ebce432404c09f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe27a704da943b833e0fcc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:52 2021 +0100 gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatA. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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.@) */

1 0

Jacek Caban : gdi32: Use NtGdiGetGlyphOutlineW for GetGlyphOutlineW.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: c221571468bd315725ccb0b5ca2d2e65694949b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c221571468bd315725ccb0b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:53 2021 +0100 gdi32: Use NtGdiGetGlyphOutlineW for GetGlyphOutlineW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 );

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 167c7a524fd0ebc8c3ef3afd1af463dbf2b374ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=167c7a524fd0ebc8c3ef3afd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:46 2021 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 131b0e33683..47196067cd4 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -133,7 +133,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) * is_valid_directory * * Helper for RtlDosPathNameToNtPathName_U_WithStatus. - * Test if the path is an exisiting directory. + * Test if the path is an existing directory. */ static BOOL is_valid_directory(LPCWSTR path) {

1 0

Francois Gouget : wmphoto: Make the wmp_decoder_*() functions static.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 50439d5ac1cf0799c17afe712a5272f5a04764d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50439d5ac1cf0799c17afe71… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:59:28 2021 +0200 wmphoto: Make the wmp_decoder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmphoto/unix_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wmphoto/unix_lib.c b/dlls/wmphoto/unix_lib.c index 235828941f7..94a67434b7e 100644 --- a/dlls/wmphoto/unix_lib.c +++ b/dlls/wmphoto/unix_lib.c @@ -180,7 +180,7 @@ static JXR_ERR wmp_stream_GetPos(struct WMPStream *iface, size_t *pos) return WMP_errSuccess; } -HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct wmp_decoder *This = impl_from_decoder(iface); HRESULT hr; @@ -252,7 +252,7 @@ HRESULT CDECL wmp_decoder_initialize(struct decoder *iface, IStream *stream, str return S_OK; } -HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct wmp_decoder *This = impl_from_decoder(iface); @@ -268,7 +268,7 @@ HRESULT CDECL wmp_decoder_get_frame_info(struct decoder *iface, UINT frame, stru return S_OK; } -HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) +static HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct wmp_decoder *This = impl_from_decoder(iface); PKRect pkrect; @@ -306,7 +306,7 @@ HRESULT CDECL wmp_decoder_copy_pixels(struct decoder *iface, UINT frame, const W prc, stride, buffersize, buffer); } -HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) +static HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { TRACE("iface %p, frame %d, count %p, blocks %p\n", iface, frame, count, blocks); @@ -315,7 +315,7 @@ HRESULT CDECL wmp_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, return S_OK; } -HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) +static HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct wmp_decoder *This = impl_from_decoder(iface); U32 count; @@ -348,7 +348,7 @@ HRESULT CDECL wmp_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL wmp_decoder_destroy(struct decoder* iface) +static void CDECL wmp_decoder_destroy(struct decoder* iface) { struct wmp_decoder *This = impl_from_decoder(iface);

1 0

Francois Gouget : winepulse.drv: Use the official PulseAudio case for the endpoint id.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 18b98df060071aad16f6fab591ce6beb127b7f14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b98df060071aad16f6fab5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:59:49 2021 +0200 winepulse.drv: Use the official PulseAudio case for the endpoint id. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index ab4cccd7242..35a66e18d8a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -147,7 +147,7 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"Pulseaudio"; +static const WCHAR defaultW[] = L"PulseAudio"; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;

1 0

Rémi Bernon : dinput: Add read event and callback for file-based devices.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: b36c6ae0e8d529cec1272156e808dddf04996187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36c6ae0e8d529cec1272156… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:20 2021 +0200 dinput: Add read event and callback for file-based devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device_private.h | 6 +++++ dlls/dinput/dinput_main.c | 53 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 1811e0cc5a6..0e72ee77bf1 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -53,6 +53,8 @@ typedef struct UINT_PTR uAppData; } ActionMap; +typedef HRESULT dinput_device_read_state( IDirectInputDevice8W *iface ); + /* Device implementation */ typedef struct IDirectInputDeviceImpl IDirectInputDeviceImpl; struct IDirectInputDeviceImpl @@ -84,6 +86,10 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + + /* internal device file reading */ + HANDLE read_event; + dinput_device_read_state *read_callback; }; extern HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl *vtbl, const GUID *guid, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 88ee1855675..1cd6d390430 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1289,6 +1289,12 @@ static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam static DWORD WINAPI hook_thread_proc(void *param) { static HHOOK kbd_hook, mouse_hook; + IDirectInputDeviceImpl *impl; + IDirectInputDevice8W *iface; + SIZE_T events_count = 0; + HANDLE finished_event; + HANDLE events[128]; + DWORD ret; MSG msg; di_em_win = CreateWindowW( di_em_win_w, di_em_win_w, 0, 0, 0, 0, 0, @@ -1298,13 +1304,42 @@ static DWORD WINAPI hook_thread_proc(void *param) PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); SetEvent(param); - while (GetMessageW( &msg, 0, 0, 0 )) + while ((ret = MsgWaitForMultipleObjectsEx( events_count, events, INFINITE, QS_ALLINPUT, 0 )) <= events_count) { UINT kbd_cnt = 0, mice_cnt = 0; - if (msg.message == WM_USER+0x10) + if (ret < events_count) { - HANDLE finished_event = (HANDLE)msg.lParam; + iface = NULL; + EnterCriticalSection( &dinput_hook_crit ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (impl->read_event == events[ret]) + { + iface = &impl->IDirectInputDevice8W_iface; + IDirectInputDevice8_AddRef( iface ); + break; + } + } + LeaveCriticalSection( &dinput_hook_crit ); + + if (iface) + { + impl->read_callback( iface ); + IDirectInputDevice8_Release( iface ); + } + } + + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message != WM_USER+0x10) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + continue; + } + + finished_event = (HANDLE)msg.lParam; TRACE( "Processing hook change notification wp:%ld lp:%#lx\n", msg.wParam, msg.lParam ); @@ -1313,12 +1348,19 @@ static DWORD WINAPI hook_thread_proc(void *param) if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); kbd_hook = mouse_hook = NULL; - break; + goto done; } + events_count = 0; EnterCriticalSection( &dinput_hook_crit ); kbd_cnt = list_count( &acquired_keyboard_list ); mice_cnt = list_count( &acquired_mouse_list ); + LIST_FOR_EACH_ENTRY( impl, &acquired_device_list, IDirectInputDeviceImpl, entry ) + { + if (!impl->read_event || !impl->read_callback) continue; + if (events_count >= ARRAY_SIZE(events)) break; + events[events_count++] = impl->read_event; + } LeaveCriticalSection( &dinput_hook_crit ); if (kbd_cnt && !kbd_hook) @@ -1340,10 +1382,9 @@ static DWORD WINAPI hook_thread_proc(void *param) if (finished_event) SetEvent(finished_event); } - TranslateMessage(&msg); - DispatchMessageW(&msg); } +done: DestroyWindow( di_em_win ); di_em_win = NULL;

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetDeviceInfo.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: wine Branch: master Commit: 787d4af53b739d843d804fbb9ba6ddc4c343f3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=787d4af53b739d843d804fbb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:21 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetDeviceInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 0d362cf9af3..d7efc44e806 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -54,6 +54,8 @@ struct hid_joystick HANDLE device; PHIDP_PREPARSED_DATA preparsed; + + DIDEVICEINSTANCEW instance; }; static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) @@ -97,14 +99,18 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, instance %p.\n", iface, instance ); if (!instance) return E_POINTER; if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return DIERR_INVALIDPARAM; - return DIERR_UNSUPPORTED; + memcpy( instance, &impl->instance, instance->dwSize ); + + return S_OK; } static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, @@ -342,6 +348,8 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID &attrs, &caps, dinput->dwVersion ); if (hr != DI_OK) goto failed; + impl->instance = instance; + *out = &impl->base.IDirectInputDevice8W_iface; return DI_OK;

1 0