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

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsW.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: b656ff5d75a83e7db0401ed231247331ee03c260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b656ff5d75a83e7db0401ed2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 27 13:51:48 2021 +0100 gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsW. 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 | 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 );

1 0

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsA.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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 Aug. 27, 2021

Aug. 27, 2021

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 Aug. 27, 2021

Aug. 27, 2021

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

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetObjectInfo.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: ef7432d86e3d7ee1edf3c814efd4ef36dbed1020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef7432d86e3d7ee1edf3c814… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:27 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetObjectInfo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index d58a8f5d919..4a05afe30c7 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -536,6 +536,43 @@ static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, return DI_OK; } +static BOOL get_object_info( struct hid_joystick *impl, struct hid_caps *caps, + DIDEVICEOBJECTINSTANCEW *instance, void *data ) +{ + DIDEVICEOBJECTINSTANCEW *dest = data; + memcpy( dest, instance, dest->dwSize ); + return DIENUM_STOP; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, DIDEVICEOBJECTINSTANCEW *instance, + DWORD obj, DWORD how ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + const DIPROPHEADER filter = + { + .dwSize = sizeof(filter), + .dwHeaderSize = sizeof(filter), + .dwHow = how, + .dwObj = obj + }; + BOOL ret; + + TRACE( "iface %p, instance %p, obj %#x, how %#x.\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + if (ret != DIENUM_CONTINUE) return S_OK; + ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + if (ret != DIENUM_CONTINUE) return S_OK; + enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL ); + + return S_OK; +} + static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); @@ -592,7 +629,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SetDataFormat, IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, - IDirectInputDevice2WImpl_GetObjectInfo, + hid_joystick_GetObjectInfo, hid_joystick_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize,

1 0

Jacek Caban : gdi32: Use NtGdiGetGlyphOutlineW for GetGlyphOutlineW.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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

Jacek Caban : gdi32: Use NtGdiGetCharABCWidthsW for GetCharABCWidthsFloatA.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

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

Piotr Caban : msvcp90: Don't use throw_exception helper for out_of_range exception.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 503f3462c64565488b0687fcaece989cb987bfca URL: https://source.winehq.org/git/wine.git/?a=commit;h=503f3462c64565488b0687fc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:24 2021 +0200 msvcp90: Don't use throw_exception helper for out_of_range exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp.h | 1 + dlls/msvcp60/string.c | 4 +--- dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 17 ++++++----------- dlls/msvcp90/exception.c | 14 +++++++------- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/string.c | 4 +--- 8 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 0c4f4f32280..bae75855c3a 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -487,3 +487,4 @@ typedef struct { void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type*); void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); +void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 22cdcd49891..45b7a57f961 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -46,10 +46,8 @@ typedef struct { /* ?_Xran(a)std@@YAXXZ */ void __cdecl _Xran(void) { - static const char msg[] = "invalid string position"; - TRACE("\n"); - throw_exception(EXCEPTION_OUT_OF_RANGE, msg); + _Xout_of_range("invalid string position"); } /* ?_Xlen(a)std@@YAXXZ */ diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 0b14806d95c..9d79ca80e21 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -319,7 +319,6 @@ typedef enum __exception_type { EXCEPTION, EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, - EXCEPTION_OUT_OF_RANGE, EXCEPTION_FAILURE, EXCEPTION_RANGE_ERROR, } exception_type; diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2c51b7ff0a..b7de12e6e90 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -470,19 +470,14 @@ size_t __cdecl _vector_base_v4__Segment_index_of(size_t x) DEFINE_THISCALL_WRAPPER(_vector_base_v4__Internal_throw_exception, 8) void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4*/ *this, size_t idx) { - static const struct { - exception_type type; - const char *msg; - } exceptions[] = { - { EXCEPTION_OUT_OF_RANGE, "Index out of range" }, - { EXCEPTION_OUT_OF_RANGE, "Index out of segments table range" }, - { EXCEPTION_RANGE_ERROR, "Index is inside segment which failed to be allocated" }, - }; - TRACE("(%p %Iu)\n", this, idx); - if(idx < ARRAY_SIZE(exceptions)) - throw_exception(exceptions[idx].type, exceptions[idx].msg); + switch(idx) { + case 0: _Xout_of_range("Index out of range"); + case 1: _Xout_of_range("Index out of segments table range"); + case 2: throw_exception(EXCEPTION_RANGE_ERROR, + "Index is inside segment which failed to be allocated"); + } } #ifdef _WIN64 diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7b92b80d393..f6a15ecc8d6 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -916,10 +916,15 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char *str) /* ?_Xout_of_range(a)std@@YAXPBD(a)Z */ /* ?_Xout_of_range(a)std@@YAXPEBD(a)Z */ -void __cdecl _Xout_of_range(const char *str) +void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char *str) { + exception_name name = EXCEPTION_NAME(str); + out_of_range e; + TRACE("(%s)\n", debugstr_a(str)); - throw_exception(EXCEPTION_OUT_OF_RANGE, str); + + MSVCP_out_of_range_ctor(&e, name); + _CxxThrowException(&e, &out_of_range_cxx_type); } /* ?_Xruntime_error(a)std@@YAXPBD(a)Z */ @@ -1081,11 +1086,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_logic_error_ctor(&e, name); _CxxThrowException(&e, &logic_error_cxx_type); } - case EXCEPTION_OUT_OF_RANGE: { - out_of_range e; - MSVCP_out_of_range_ctor(&e, name); - _CxxThrowException(&e, &out_of_range_cxx_type); - } case EXCEPTION_FAILURE: { failure e; MSVCP_failure_ctor(&e, name); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0afe394ad2d..116f3c75e5d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -1613,7 +1613,7 @@ ctype_base* __thiscall ctype_base_vector_dtor(ctype_base *this, unsigned int fla /* ?_Xran(a)ctype_base@std@@KAXXZ */ void __cdecl ctype_base__Xran(void) { - throw_exception(EXCEPTION_OUT_OF_RANGE, "out of range in ctype<T>"); + _Xout_of_range("out of range in ctype<T>"); } /* ?id@?$ctype(a)D@std@@2V0locale(a)2@A */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 3f862f1b2c1..7452a7f6a99 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -667,4 +667,5 @@ void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type* void __cdecl DECLSPEC_NORETURN _Xinvalid_argument(const char*); void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); +void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 7609f913093..3384069bd03 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -468,10 +468,8 @@ void __thiscall _String_base__Xlen(const void/*_String_base*/ *this) /* ?_Xran(a)_String_base@std@@SAXXZ */ void CDECL MSVCP__String_base_Xran(void) { - static const char msg[] = "invalid string position"; - TRACE("\n"); - throw_exception(EXCEPTION_OUT_OF_RANGE, msg); + _Xout_of_range("invalid string position"); } /* ?_Xran(a)_String_base@std@@QBEXXZ */

1 0

Piotr Caban : msvcp90: Don't use throw_exception helper for invalid_argument exception.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: b561d0130529fbceabbcca3091945b3fbdd76705 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b561d0130529fbceabbcca30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:18 2021 +0200 msvcp90: Don't use throw_exception helper for invalid_argument exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/exception.c | 14 +++++++------- dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/string.c | 4 +--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 72e96133f8f..5bdebb605d6 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -320,7 +320,6 @@ typedef enum __exception_type { EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_OUT_OF_RANGE, - EXCEPTION_INVALID_ARGUMENT, EXCEPTION_RUNTIME_ERROR, EXCEPTION_FAILURE, EXCEPTION_RANGE_ERROR, diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index face3ea09b0..f635a80a90c 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -890,10 +890,15 @@ void __cdecl DECLSPEC_NORETURN _Xmem(void) /* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */ /* ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z */ -void __cdecl _Xinvalid_argument(const char *str) +void __cdecl DECLSPEC_NORETURN _Xinvalid_argument(const char *str) { + exception_name name = EXCEPTION_NAME(str); + invalid_argument e; + TRACE("(%s)\n", debugstr_a(str)); - throw_exception(EXCEPTION_INVALID_ARGUMENT, str); + + MSVCP_invalid_argument_ctor(&e, name); + _CxxThrowException(&e, &invalid_argument_cxx_type); } /* ?_Xlength_error(a)std@@YAXPBD(a)Z */ @@ -1076,11 +1081,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_out_of_range_ctor(&e, name); _CxxThrowException(&e, &out_of_range_cxx_type); } - case EXCEPTION_INVALID_ARGUMENT: { - invalid_argument e; - MSVCP_invalid_argument_ctor(&e, name); - _CxxThrowException(&e, &invalid_argument_cxx_type); - } case EXCEPTION_RUNTIME_ERROR: { runtime_error e; MSVCP_runtime_error_ctor(&e, name); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 410c406d86c..144bf4d3a9a 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -664,5 +664,6 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #endif void WINAPI DECLSPEC_NORETURN _CxxThrowException(void*,const cxx_exception_type*); +void __cdecl DECLSPEC_NORETURN _Xinvalid_argument(const char*); void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 89aacdd7cb7..7609f913093 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -484,10 +484,8 @@ void __thiscall _String_base__Xran(const void/*_String_base*/ *this) /* ?_Xinvarg(a)_String_base@std@@SAXXZ */ void CDECL MSVCP__String_base_Xinvarg(void) { - static const char msg[] = "invalid string argument"; - TRACE("\n"); - throw_exception(EXCEPTION_INVALID_ARGUMENT, msg); + _Xinvalid_argument("invalid string argument"); }

1 0

Piotr Caban : msvcp90: Use throw_exception helper to throw exception object only.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 731dca90c7fa0e09594e1505daca83b75a79815f URL: https://source.winehq.org/git/wine.git/?a=commit;h=731dca90c7fa0e09594e1505… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 27 13:48:39 2021 +0200 msvcp90: Use throw_exception helper to throw exception object only. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 8 -------- dlls/msvcp90/exception.c | 30 +++++++----------------------- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp90.h | 1 + 4 files changed, 9 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 58f6fe43586..29854d16bab 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -314,14 +314,6 @@ typedef struct __exception int do_free; /* Whether to free 'name' in our dtor */ } exception; -/* Internal: throws selected exception */ -typedef enum __exception_type { - EXCEPTION, - EXCEPTION_BAD_CAST, - EXCEPTION_LOGIC_ERROR, -} exception_type; -void throw_exception(exception_type, const char *); - /* rtti */ typedef struct __type_info { diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 977bdff9739..e5b6018fe31 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -399,7 +399,7 @@ DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_er #else DEFINE_RTTI_DATA1(logic_error, 0, &exception_rtti_base_descriptor, ".?AVlogic_error@@") #endif -DEFINE_CXX_DATA1(logic_error, &exception_cxx_type_info, MSVCP_logic_error_dtor) +DEFINE_CXX_TYPE_INFO(logic_error) /* length_error class data */ typedef logic_error length_error; @@ -817,7 +817,6 @@ bad_cast* __thiscall MSVCP_bad_cast_opequals(bad_cast *this, const bad_cast *rhs } DEFINE_RTTI_DATA1(bad_cast, 0, &exception_rtti_base_descriptor, ".?AVbad_cast(a)std@@") -DEFINE_CXX_DATA1(bad_cast, &exception_cxx_type_info, MSVCP_bad_cast_dtor) /* range_error class data */ typedef runtime_error range_error; @@ -1065,28 +1064,14 @@ __ASM_BLOCK_BEGIN(exception_vtables) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); __ASM_BLOCK_END -/* Internal: throws selected exception */ -void throw_exception(exception_type et, const char *str) +/* Internal: throws exception */ +void DECLSPEC_NORETURN throw_exception(const char *str) { exception_name name = EXCEPTION_NAME(str); + exception e; - switch(et) { - case EXCEPTION: { - exception e; - MSVCP_exception_ctor(&e, name); - _CxxThrowException(&e, &exception_cxx_type); - } - case EXCEPTION_BAD_CAST: { - bad_cast e; - MSVCP_bad_cast_ctor(&e, str); - _CxxThrowException(&e, &bad_cast_cxx_type); - } - case EXCEPTION_LOGIC_ERROR: { - logic_error e; - MSVCP_logic_error_ctor(&e, name); - _CxxThrowException(&e, &logic_error_cxx_type); - } - } + MSVCP_exception_ctor(&e, name); + _CxxThrowException(&e, &exception_cxx_type); } /* Internal: throws range_error exception */ @@ -1132,7 +1117,7 @@ void init_exception(void *base) init_exception_cxx(base); init_bad_alloc_cxx(base); - init_logic_error_cxx(base); + init_logic_error_cxx_type_info(base); init_length_error_cxx(base); init_out_of_range_cxx(base); init_invalid_argument_cxx(base); @@ -1144,7 +1129,6 @@ void init_exception(void *base) init_system_error_cxx_type_info(base); #endif init_failure_cxx(base); - init_bad_cast_cxx(base); init_range_error_cxx(base); #endif } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8eacccc1461..5c4f997411a 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -700,7 +700,7 @@ unsigned int __cdecl _Random_device(void) /* TODO: throw correct exception in case of failure */ if(rand_s(&ret)) - throw_exception(EXCEPTION, "random number generator failed\n"); + throw_exception("random number generator failed\n"); return ret; } #endif diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index e917fad4e28..4aa88e028d6 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -669,5 +669,6 @@ void __cdecl DECLSPEC_NORETURN _Xlength_error(const char*); void __cdecl DECLSPEC_NORETURN _Xmem(void); void __cdecl DECLSPEC_NORETURN _Xout_of_range(const char*); void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char*); +void DECLSPEC_NORETURN throw_exception(const char*); void DECLSPEC_NORETURN throw_failure(const char*); void DECLSPEC_NORETURN throw_range_error(const char*);

1 0