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

Piotr Caban : msvcp90: Always throw bad_alloc exception in operator_new on allocation failure.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: ff5d176ce22ea9b3f65a3701d41232d29e2c1493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5d176ce22ea9b3f65a3701… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:56 2021 +0200 msvcp90: Always throw bad_alloc exception in operator_new on allocation failure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 16 --- dlls/msvcp60/main.c | 24 +++- dlls/msvcp60/msvcp.h | 4 +- dlls/msvcp90/ios.c | 16 --- dlls/msvcp90/locale.c | 355 ++-------------------------------------------- dlls/msvcp90/misc.c | 5 - dlls/msvcp90/msvcp90.h | 5 - dlls/msvcp90/msvcp_main.c | 26 +++- dlls/msvcp90/string.c | 8 -- 9 files changed, 54 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff5d176ce22ea9b3f65a…

1 0

Piotr Caban : msvcp90: Move Concurrency::details functions to details.c file.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 6cca4e254c7a487e7b3c3da2ad9a4035f2b2abbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cca4e254c7a487e7b3c3da2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:50 2021 +0200 msvcp90: Move Concurrency::details functions to details.c file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/Makefile.in | 1 + dlls/msvcp110/Makefile.in | 1 + dlls/msvcp120/Makefile.in | 1 + dlls/msvcp140/Makefile.in | 1 + dlls/msvcp90/Makefile.in | 1 + dlls/msvcp90/details.c | 1135 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 1235 +++------------------------------------------ dlls/msvcp90/msvcp90.h | 7 +- dlls/msvcp90/msvcp_main.c | 1 + 9 files changed, 1208 insertions(+), 1175 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cca4e254c7a487e7b3c…

1 0

Piotr Caban : msvcp90: Remove MSVCRT_ prefix from new() and delete().
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 3a86f0a68fb137b1ddc1194125c1546bf72613bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a86f0a68fb137b1ddc11941… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:20:53 2021 +0200 msvcp90: Remove MSVCRT_ prefix from new() and delete(). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 124 ++++++++++----------- dlls/msvcp60/ios.c | 172 ++++++++++++++--------------- dlls/msvcp60/main.c | 12 +- dlls/msvcp60/msvcp.h | 4 +- dlls/msvcp90/details.c | 8 +- dlls/msvcp90/exception.c | 24 ++-- dlls/msvcp90/ios.c | 166 ++++++++++++++-------------- dlls/msvcp90/locale.c | 274 +++++++++++++++++++++++----------------------- dlls/msvcp90/memory.c | 12 +- dlls/msvcp90/misc.c | 18 +-- dlls/msvcp90/msvcp90.h | 9 +- dlls/msvcp90/msvcp_main.c | 19 ++-- dlls/msvcp90/string.c | 8 +- 13 files changed, 427 insertions(+), 423 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a86f0a68fb137b1ddc1…

1 0

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

Aug. 26, 2021

Module: wine Branch: master Commit: 1c09a7c5c4bd4ef851a42180396d87ea6cd500b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c09a7c5c4bd4ef851a42180… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 26 14:21:28 2021 +0200 msvcp90: Don't use throw_exception helper for bad_alloc exception. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/msvcp.h | 1 + dlls/msvcp90/cxx.h | 1 - dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 21 ++++++++++++--------- dlls/msvcp90/memory.c | 12 ++---------- dlls/msvcp90/msvcp90.h | 3 ++- dlls/msvcp90/msvcp_main.c | 5 ++--- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 9d77fd190ca..cecea919bed 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -65,7 +65,7 @@ void* (__cdecl *MSVCRT_set_new_handler)(void*); void* __cdecl operator_new(size_t size) { void *ret = MSVCRT_operator_new(size); - if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + if (!ret) _Xmem(); return ret; } diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index d60a588b3eb..1f53a31ad97 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -485,3 +485,4 @@ typedef struct { } complex_double; void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); +void __cdecl DECLSPEC_NORETURN _Xmem(void); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 50d78dbddb6..c1000579443 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -317,7 +317,6 @@ typedef struct __exception /* Internal: throws selected exception */ typedef enum __exception_type { EXCEPTION, - EXCEPTION_BAD_ALLOC, EXCEPTION_BAD_CAST, EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index b265bf1be71..d2c51b7ff0a 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -89,7 +89,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_throw_exception( const _Concurrent_queue_base_v4 *this) { TRACE("(%p)\n", this); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); + _Xmem(); } /* ??0_Concurrent_queue_base_v4(a)details@Concurrency@@IAE(a)I@Z */ diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index eec72b9964d..115e0374f7f 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -867,17 +867,25 @@ DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exceptio DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) /* ?_Nomemory(a)std@@YAXXZ */ -void __cdecl _Nomemory(void) +void __cdecl DECLSPEC_NORETURN _Nomemory(void) { + bad_alloc e; + TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + + MSVCP_bad_alloc_default_ctor(&e); + _CxxThrowException(&e, &bad_alloc_cxx_type); } /* ?_Xmem(a)tr1@std@@YAXXZ */ -void __cdecl _Xmem(void) +void __cdecl DECLSPEC_NORETURN _Xmem(void) { + bad_alloc e; + TRACE("()\n"); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + + MSVCP_bad_alloc_default_ctor(&e); + _CxxThrowException(&e, &bad_alloc_cxx_type); } /* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */ @@ -1048,11 +1056,6 @@ void throw_exception(exception_type et, const char *str) MSVCP_exception_ctor(&e, name); _CxxThrowException(&e, &exception_cxx_type); } - case EXCEPTION_BAD_ALLOC: { - bad_alloc e; - MSVCP_bad_alloc_ctor(&e, name); - _CxxThrowException(&e, &bad_alloc_cxx_type); - } case EXCEPTION_BAD_CAST: { bad_cast e; MSVCP_bad_cast_ctor(&e, str); diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index 0e3fb2347e8..d1fe7ce5786 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -170,11 +170,7 @@ void __thiscall MSVCP_allocator_wchar_deallocate(void *this, DEFINE_THISCALL_WRAPPER(MSVCP_allocator_wchar_allocate, 8) wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, size_t count) { - if(UINT_MAX/count < sizeof(wchar_t)) { - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - + if(UINT_MAX/count < sizeof(wchar_t)) _Xmem(); return operator_new(count * sizeof(wchar_t)); } @@ -269,11 +265,7 @@ DEFINE_THISCALL_WRAPPER(MSVCP_allocator_short_allocate, 8) unsigned short* __thiscall MSVCP_allocator_short_allocate( void *this, size_t count) { - if(UINT_MAX/count < sizeof(unsigned short)) { - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - + if(UINT_MAX/count < sizeof(unsigned short)) _Xmem(); return operator_new(count * sizeof(unsigned short)); } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 94098d84135..0ef02b96ea8 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -663,4 +663,5 @@ static inline int mbstowcs_wrapper( size_t *ret, wchar_t *wcs, size_t size, cons #define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) #endif -void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI DECLSPEC_NORETURN _CxxThrowException(exception*,const cxx_exception_type*); +void __cdecl DECLSPEC_NORETURN _Xmem(void); diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index eed4beb41ac..7f61f59a078 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -94,8 +94,7 @@ void* __cdecl operator_new(size_t size) } while (freed); TRACE("(%Iu) out of memory\n", size); - throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); - return NULL; + _Xmem(); } void __cdecl operator_delete(void *mem) @@ -116,7 +115,7 @@ void* __cdecl operator_new(size_t size) { void *ret = MSVCRT_operator_new(size); #if _MSVCP_VER < 80 - if (!ret) throw_exception(EXCEPTION_BAD_ALLOC, "bad allocation"); + if (!ret) _Xmem(); #endif return ret; }

1 0

Jacek Caban : gdi32/tests: Add more char width tests.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: ba1769cb7d28e42537290ba6959255e26124d998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba1769cb7d28e42537290ba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:12 2021 +0100 gdi32/tests: Add more char width tests. 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/tests/font.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef1dc26595d..04fe6afd875 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1127,6 +1127,12 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, abc); + ok(ret, "%s: GetCharABCWidthsI should have succeeded\n", description); + ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); + ok(abc->abcA * base_abci->abcA >= 0, "%s: abcA's sign should be unchanged\n", description); + ok(abc->abcC * base_abci->abcC >= 0, "%s: abcC's sign should be unchanged\n", description); + ret = GetCharABCWidthsW(hdc, 'i', 'i', abc); ok(ret, "%s: GetCharABCWidthsW should have succeeded\n", description); ok ((INT)abc->abcB > 0, "%s: abcB should be positive\n", description); @@ -7009,8 +7015,9 @@ static void test_GetCharWidthI(void) HFONT hfont, prev_hfont; WORD glyphs[5]; INT widths[5]; + INT width; LOGFONTA lf; - ABC abc[5]; + ABC abc[5], abc1; int len, i; DWORD nb; BOOL ret; @@ -7033,10 +7040,20 @@ static void test_GetCharWidthI(void) ret = GetCharABCWidthsI(hdc, 0, len, glyphs, abc); ok(ret, "GetCharABCWidthsI failed\n"); + memset(&abc1, 0xcc, sizeof(abc1)); + ret = GetCharABCWidthsI(hdc, glyphs[0], 1, NULL, &abc1); + ok(ret, "GetCharABCWidthsI failed\n"); + ok(!memcmp(&abc1, abc, sizeof(abc1)), "unexpected abc1\n"); + memset(widths, 0xcc, sizeof(widths)); ret = GetCharWidthI(hdc, 0, len, glyphs, widths); ok(ret, "GetCharWidthI failed\n"); + width = 0xdeadbeef; + ret = GetCharWidthI(hdc, glyphs[0], 1, NULL, &width); + ok(ret, "GetCharWidthI failed\n"); + ok(width == widths[0], "unexpected width %u\n", width); + for (i = 0; i < len; i++) ok(widths[i] == abc[i].abcA + abc[i].abcB + abc[i].abcC, "%u, glyph %u, got width %d\n", i, glyphs[i], widths[i]);

1 0

Jacek Caban : gdi32/tests: Use winetest_debug to silence noisy traces.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: c3ad3f2bd073ba2673ee7ef14c07d991db53ad1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ad3f2bd073ba2673ee7ef1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:13 2021 +0100 gdi32/tests: Use winetest_debug to silence noisy traces. 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/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 04fe6afd875..f93e5e5e5d0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5493,9 +5493,9 @@ static INT CALLBACK enum_ms_shell_dlg_proc(const LOGFONTA *lf, const TEXTMETRICA { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg") != 0) return 1; @@ -5514,9 +5514,9 @@ static INT CALLBACK enum_ms_shell_dlg2_proc(const LOGFONTA *lf, const TEXTMETRIC { struct enum_fullname_data *efnd = (struct enum_fullname_data *)lParam; -if (0) /* Disabled to limit console spam */ - trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", - lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); + if (winetest_debug > 2) + trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", + lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); if (type != TRUETYPE_FONTTYPE) return 1; if (strcmp(lf->lfFaceName, "MS Shell Dlg 2") != 0) return 1;

1 0

Jacek Caban : gdi32: Use NtGdiGetCharWidthW for GetCharWidth.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: baa605698052cb788bb2675ef9eec604f033222f URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa605698052cb788bb2675e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:14 2021 +0100 gdi32: Use NtGdiGetCharWidthW for GetCharWidth. 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 | 45 +++------------------------ dlls/gdi32/text.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 6 +++- 3 files changed, 103 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cdd3ca24034..c88e69ef013 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4862,11 +4862,10 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT } /*********************************************************************** - * GetCharWidthW (GDI32.@) - * GetCharWidth32W (GDI32.@) + * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, + ULONG flags, void *buf ) { UINT i; BOOL ret; @@ -4876,10 +4875,11 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, if (!dc) return FALSE; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); if (ret) { + INT *buffer = buf; /* convert device units to logical */ for( i = firstChar; i <= lastChar; i++, buffer++ ) *buffer = width_to_LP( dc, *buffer ); @@ -4889,41 +4889,6 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT firstChar, UINT lastChar, } -/*********************************************************************** - * GetCharWidthA (GDI32.@) - * GetCharWidth32A (GDI32.@) - */ -BOOL WINAPI GetCharWidth32A( HDC hdc, UINT firstChar, UINT lastChar, - LPINT buffer ) -{ - 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); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W(hdc, wstr[i], wstr[i], buffer)) - { - ret = FALSE; - break; - } - buffer++; - } - - HeapFree(GetProcessHeap(), 0, str); - HeapFree(GetProcessHeap(), 0, wstr); - - return ret; -} - - /* helper for nulldrv_ExtTextOut */ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, GLYPHMETRICS *metrics, struct gdi_image_bits *image ) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index acc796fce30..167aa5cc07d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1570,3 +1570,96 @@ UINT WINAPI GetOutlineTextMetricsW( HDC hdc, UINT size, OUTLINETEXTMETRICW *otm { return NtGdiGetOutlineTextMetricsInternalW( hdc, size, otm, 0 ); } + +/*********************************************************************** + * GetCharWidthW (GDI32.@) + * GetCharWidth32W (GDI32.@) + */ +BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); +} + +static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +{ + INT i, count = last - first + 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 (last > 0xffff) + return NULL; + if ((first ^ last) > 0xff) + return NULL; + break; + default: + if (last > 0xff) + return NULL; + mbcp = 0; + break; + } + + if (!(str = HeapAlloc( GetProcessHeap(), 0, count * 2 + 1 ))) + return NULL; + + for (i = 0, c = first; c <= last; 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'; + + *byte_len = i; + return str; +} + +/*********************************************************************** + * GetCharWidthA (GDI32.@) + * GetCharWidth32A (GDI32.@) + */ +BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) +{ + INT i, wlen; + LPSTR str; + LPWSTR wstr; + BOOL ret = TRUE; + + str = get_chars_by_range( hdc, first, last, &i ); + if (str == NULL) + return FALSE; + + wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); + + for(i = 0; i < wlen; i++) + { + if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) + { + ret = FALSE; + break; + } + buffer++; + } + + HeapFree( GetProcessHeap(), 0, str ); + HeapFree( GetProcessHeap(), 0, wstr ); + return ret; +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 66611b38fb0..7e75b944e85 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -123,6 +123,9 @@ enum NtGdiSetDIBColorTable, }; +#define NTGDI_GETCHARWIDTH_INT 0x02 +#define NTGDI_GETCHARWIDTH_INDICES 0x08 + #define MWT_SET 4 /* structs not compatible with native Windows */ @@ -227,7 +230,8 @@ 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 NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, INT *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 ); BOOL WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result ); INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap );

1 0

Jacek Caban : gdi32: Support passing an array of chars to NtGdiGetCharWidthW.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 2c77643ee9d22295bbd7a0482009b7d8d3907fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c77643ee9d22295bbd7a048… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:15 2021 +0100 gdi32: Support passing an array of chars to NtGdiGetCharWidthW. And use it for GetCharWidthA. 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 | 29 ++++++++++++++++------------- dlls/gdi32/text.c | 38 ++++++++++++-------------------------- dlls/wineps.drv/builtin.c | 24 +++++++++++++----------- dlls/wineps.drv/psdrv.h | 2 +- include/wine/gdi_driver.h | 4 ++-- 6 files changed, 46 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index f370d088585..3d64eedc638 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -380,7 +380,8 @@ static BOOL CDECL nulldrv_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count return FALSE; } -static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { return FALSE; } diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c88e69ef013..7e4d67af8ae 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3089,27 +3089,29 @@ static BOOL CDECL font_GetCharABCWidthsI( PHYSDEV dev, UINT first, UINT count, W /************************************************************* * font_GetCharWidth */ -static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffer ) +static BOOL CDECL font_GetCharWidth( PHYSDEV dev, UINT first, UINT count, + const WCHAR *chars, INT *buffer ) { struct font_physdev *physdev = get_font_dev( dev ); + UINT c, i; ABC abc; - UINT c; if (!physdev->font) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, first, last, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE( "%p, %d, %d, %p\n", physdev->font, first, last, buffer ); + TRACE( "%p, %d, %d, %p\n", physdev->font, first, count, buffer ); EnterCriticalSection( &font_cs ); - for (c = first; c <= last; c++) + for (i = 0; i < count; i++) { + c = chars ? chars[i] : i + first; if (get_glyph_outline( physdev->font, c, GGO_METRICS, NULL, &abc, 0, NULL, NULL ) == GDI_ERROR) - buffer[c - first] = 0; + buffer[i] = 0; else - buffer[c - first] = abc.abcA + abc.abcB + abc.abcC; + buffer[i] = abc.abcA + abc.abcB + abc.abcC; } LeaveCriticalSection( &font_cs ); return TRUE; @@ -4864,25 +4866,26 @@ static LPSTR FONT_GetCharsByRangeA(HDC hdc, UINT firstChar, UINT lastChar, PINT /*********************************************************************** * NtGdiGetCharWidthW (win32u.@) */ -BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT firstChar, UINT lastChar, WCHAR *chars, +BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, ULONG flags, void *buf ) { - UINT i; + UINT i, count = last; BOOL ret; PHYSDEV dev; DC * dc = get_dc_ptr( hdc ); if (!dc) return FALSE; + if (!chars) count = last - first + 1; dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - ret = dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buf ); + ret = dev->funcs->pGetCharWidth( dev, first, count, chars, buf ); if (ret) { INT *buffer = buf; /* convert device units to logical */ - for( i = firstChar; i <= lastChar; i++, buffer++ ) - *buffer = width_to_LP( dc, *buffer ); + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); } release_dc_ptr( dc ); return ret; @@ -6479,7 +6482,7 @@ BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) } dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last, ibuffer ))) + if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) { float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; for (i = first; i <= last; ++i) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 167aa5cc07d..0bb47f00c24 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1580,12 +1580,13 @@ BOOL WINAPI GetCharWidth32W( HDC hdc, UINT first, UINT last, INT *buffer ) return NtGdiGetCharWidthW( hdc, first, last, NULL, NTGDI_GETCHARWIDTH_INT, buffer ); } -static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) +static WCHAR *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *ret_len ) { INT i, count = last - first + 1; + WCHAR *wstr; + char *str; UINT mbcp; UINT c; - LPSTR str; if (count <= 0) return NULL; @@ -1628,8 +1629,9 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) } str[i] = '\0'; - *byte_len = i; - return str; + wstr = text_mbtowc( hdc, str, i, ret_len, NULL ); + HeapFree( GetProcessHeap(), 0, str ); + return wstr; } /*********************************************************************** @@ -1638,28 +1640,12 @@ static char *get_chars_by_range( HDC hdc, UINT first, UINT last, INT *byte_len ) */ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) { - INT i, wlen; - LPSTR str; - LPWSTR wstr; - BOOL ret = TRUE; - - str = get_chars_by_range( hdc, first, last, &i ); - if (str == NULL) - return FALSE; - - wstr = text_mbtowc( hdc, str, i, &wlen, NULL ); - - for(i = 0; i < wlen; i++) - { - if(!GetCharWidth32W( hdc, wstr[i], wstr[i], buffer )) - { - ret = FALSE; - break; - } - buffer++; - } + WCHAR *chars; + INT count; + BOOL ret; - HeapFree( GetProcessHeap(), 0, str ); - HeapFree( GetProcessHeap(), 0, wstr ); + if (!(chars = get_chars_by_range( hdc, first, last, &count ))) return FALSE; + ret = NtGdiGetCharWidthW( hdc, 0, count, chars, NTGDI_GETCHARWIDTH_INT, buffer ); + HeapFree( GetProcessHeap(), 0, chars ); return ret; } diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 22397567aa4..11ba2154148 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -343,28 +343,30 @@ BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT /*********************************************************************** * PSDRV_GetCharWidth */ -BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) +BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - UINT i; + UINT i, c; if (physDev->font.fontloc == Download) { dev = GET_NEXT_PHYSDEV( dev, pGetCharWidth ); - return dev->funcs->pGetCharWidth( dev, firstChar, lastChar, buffer ); + return dev->funcs->pGetCharWidth( dev, first, count, chars, buffer ); } - TRACE("U+%.4X U+%.4X\n", firstChar, lastChar); + TRACE("U+%.4X +%u\n", first, count); - if (lastChar > 0xffff || firstChar > lastChar) + for (i = 0; i < count; ++i) { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + c = chars ? chars[i] : first + i; - for (i = firstChar; i <= lastChar; ++i) - { - *buffer = floor( PSDRV_UVMetrics(i, physDev->font.fontinfo.Builtin.afm)->WX + if (c > 0xffff) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + *buffer = floor( PSDRV_UVMetrics(c, physDev->font.fontinfo.Builtin.afm)->WX * physDev->font.fontinfo.Builtin.scale + 0.5 ); TRACE("U+%.4X: %i\n", i, *buffer); ++buffer; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 84828a5c9ce..db7c6e37f7c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -439,7 +439,7 @@ extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID extern BOOL CDECL PSDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_FillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; -extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT firstChar, UINT lastChar, LPINT buffer) DECLSPEC_HIDDEN; +extern BOOL CDECL PSDRV_GetCharWidth(PHYSDEV dev, UINT first, UINT count, const WCHAR *chars, INT *buffer) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextExtentExPoint(PHYSDEV dev, LPCWSTR str, INT count, LPINT alpDx) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_GetTextMetrics(PHYSDEV dev, TEXTMETRICW *metrics) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_LineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 5ca84ccf56c..6db6cf94b70 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -99,7 +99,7 @@ struct gdi_dc_funcs UINT (CDECL *pGetBoundsRect)(PHYSDEV,RECT*,UINT); BOOL (CDECL *pGetCharABCWidths)(PHYSDEV,UINT,UINT,LPABC); BOOL (CDECL *pGetCharABCWidthsI)(PHYSDEV,UINT,UINT,WORD*,LPABC); - BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,LPINT); + BOOL (CDECL *pGetCharWidth)(PHYSDEV,UINT,UINT,const WCHAR*,LPINT); BOOL (CDECL *pGetCharWidthInfo)(PHYSDEV,void*); INT (CDECL *pGetDeviceCaps)(PHYSDEV,INT); BOOL (CDECL *pGetDeviceGammaRamp)(PHYSDEV,LPVOID); @@ -169,7 +169,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 64 +#define WINE_GDI_DRIVER_VERSION 65 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */

1 0

Jacek Caban : gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: e5f5e7342d99c8363a84e316b7d81d967686ac76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5f5e7342d99c8363a84e316… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 26 13:45:16 2021 +0100 gdi32: Use NtGdiGetCharWidthW for GetCharWidthFloatW. 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 | 8 ++++++++ 2 files changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7e4d67af8ae..cbf3f6fb555 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4882,10 +4882,19 @@ BOOL WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first, UINT last, WCHAR *chars, if (ret) { - INT *buffer = buf; - /* convert device units to logical */ - for (i = 0; i < count; i++) - buffer[i] = width_to_LP( dc, buffer[i] ); + if (flags & NTGDI_GETCHARWIDTH_INT) + { + INT *buffer = buf; + /* convert device units to logical */ + for (i = 0; i < count; i++) + buffer[i] = width_to_LP( dc, buffer[i] ); + } + else + { + float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; + for (i = 0; i < count; i++) + ((float *)buf)[i] = ((int *)buf)[i] * scale; + } } release_dc_ptr( dc ); return ret; @@ -6460,39 +6469,6 @@ BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) return TRUE; } -/************************************************************************* - * GetCharWidthFloatW [GDI32.@] - */ -BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) -{ - DC *dc = get_dc_ptr( hdc ); - int *ibuffer; - PHYSDEV dev; - BOOL ret; - UINT i; - - TRACE("dc %p, first %#x, last %#x, buffer %p\n", dc, first, last, buffer); - - if (!dc) return FALSE; - - if (!(ibuffer = heap_alloc( (last - first + 1) * sizeof(int) ))) - { - release_dc_ptr( dc ); - return FALSE; - } - - dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); - if ((ret = dev->funcs->pGetCharWidth( dev, first, last - first + 1, NULL, ibuffer ))) - { - float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; - for (i = first; i <= last; ++i) - buffer[i - first] = ibuffer[i - first] * scale; - } - - heap_free(ibuffer); - return ret; -} - /*********************************************************************** * * * Font Resource API * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 0bb47f00c24..b753dac7052 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1649,3 +1649,11 @@ BOOL WINAPI GetCharWidth32A( HDC hdc, UINT first, UINT last, INT *buffer ) HeapFree( GetProcessHeap(), 0, chars ); return ret; } + +/*********************************************************************** + * GetCharWidthFloatW (GDI32.@) + */ +BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) +{ + return NtGdiGetCharWidthW( hdc, first, last, NULL, 0, buffer ); +}

1 0

Francois Gouget : user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message.
by Alexandre Julliard Aug. 26, 2021

Aug. 26, 2021

Module: wine Branch: master Commit: 2d52e16f2a6b2fc2971eb3dd071686a5d640ddc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d52e16f2a6b2fc2971eb3dd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 13:13:35 2021 +0200 user32/tests: Fix an ASCII / ANSI mixup in a dde ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 96cf210d542..888801dad90 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -2649,8 +2649,8 @@ static void test_end_to_end_server(void) HDDEDATA hdata; static const char test_service[] = "TestDDEService"; - trace("client %s, server %s\n", unicode_client ? "unicode" : "ascii", - unicode_server ? "unicode" : "ascii"); + trace("client %s, server %s\n", unicode_client ? "unicode" : "ansi", + unicode_server ? "unicode" : "ansi"); server_pid = 0; msg_index = 0;

1 0