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

Jacek Caban : gdi32: Move ExtTextOutW wrappers to text.c.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: cd60db086a4c96df797fb81b7e5461f286b99531 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd60db086a4c96df797fb81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:01 2021 +0200 gdi32: Move ExtTextOutW wrappers to text.c. 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 | 111 ---------------------------------------------- dlls/gdi32/text.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 111 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 359ebfbc0bd..6905d21751b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5748,66 +5748,6 @@ BOOL CDECL nulldrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT return TRUE; } - -/*********************************************************************** - * ExtTextOutA (GDI32.@) - * - * See ExtTextOutW. - */ -BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, - const RECT *lprect, LPCSTR str, UINT count, const INT *lpDx ) -{ - INT wlen; - UINT codepage; - LPWSTR p; - BOOL ret; - LPINT lpDxW = NULL; - - if (count > INT_MAX) return FALSE; - - if (flags & ETO_GLYPH_INDEX) - return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx ); - - p = FONT_mbtowc(hdc, str, count, &wlen, &codepage); - - if (lpDx) { - unsigned int i = 0, j = 0; - - /* allocate enough for a ETO_PDY */ - lpDxW = HeapAlloc( GetProcessHeap(), 0, 2*wlen*sizeof(INT)); - while(i < count) { - if(IsDBCSLeadByteEx(codepage, str[i])) - { - if(flags & ETO_PDY) - { - lpDxW[j++] = lpDx[i * 2] + lpDx[(i + 1) * 2]; - lpDxW[j++] = lpDx[i * 2 + 1] + lpDx[(i + 1) * 2 + 1]; - } - else - lpDxW[j++] = lpDx[i] + lpDx[i + 1]; - i = i + 2; - } - else - { - if(flags & ETO_PDY) - { - lpDxW[j++] = lpDx[i * 2]; - lpDxW[j++] = lpDx[i * 2 + 1]; - } - else - lpDxW[j++] = lpDx[i]; - i = i + 1; - } - } - } - - ret = ExtTextOutW( hdc, x, y, flags, lprect, p, wlen, lpDxW ); - - HeapFree( GetProcessHeap(), 0, p ); - HeapFree( GetProcessHeap(), 0, lpDxW ); - return ret; -} - /*********************************************************************** * get_line_width * @@ -6213,57 +6153,6 @@ done: } -/*********************************************************************** - * TextOutA (GDI32.@) - */ -BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, LPCSTR str, INT count ) -{ - return ExtTextOutA( hdc, x, y, 0, NULL, str, count, NULL ); -} - - -/*********************************************************************** - * TextOutW (GDI32.@) - */ -BOOL WINAPI TextOutW(HDC hdc, INT x, INT y, LPCWSTR str, INT count) -{ - return ExtTextOutW( hdc, x, y, 0, NULL, str, count, NULL ); -} - - -/*********************************************************************** - * PolyTextOutA (GDI32.@) - * - * See PolyTextOutW. - */ -BOOL WINAPI PolyTextOutA( HDC hdc, const POLYTEXTA *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutA( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - - -/*********************************************************************** - * PolyTextOutW (GDI32.@) - * - * Draw several Strings - * - * RETURNS - * TRUE: Success. - * FALSE: Failure. - */ -BOOL WINAPI PolyTextOutW( HDC hdc, const POLYTEXTW *pptxt, INT cStrings ) -{ - for (; cStrings>0; cStrings--, pptxt++) - if (!ExtTextOutW( hdc, pptxt->x, pptxt->y, pptxt->uiFlags, &pptxt->rcl, pptxt->lpstr, pptxt->n, pptxt->pdx )) - return FALSE; - return TRUE; -} - - /*********************************************************************** * GetAspectRatioFilterEx (GDI32.@) */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 156cb3986aa..66a51e89817 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -669,6 +669,36 @@ cleanup: return ret; } +/*********************************************************************** + * text_mbtowc + * + * Returns a Unicode translation of str using the charset of the + * currently selected font in hdc. If count is -1 then str is assumed + * to be '\0' terminated, otherwise it contains the number of bytes to + * convert. If plenW is non-NULL, on return it will point to the + * number of WCHARs that have been written. If ret_cp is non-NULL, on + * return it will point to the codepage used in the conversion. The + * caller should free the returned string from the process heap + * itself. + */ +static WCHAR *text_mbtowc( HDC hdc, const char *str, INT count, INT *plenW, UINT *ret_cp ) +{ + UINT cp; + INT lenW; + LPWSTR strW; + + cp = GdiGetCodePage( hdc ); + + if (count == -1) count = strlen( str ); + lenW = MultiByteToWideChar( cp, 0, str, count, NULL, 0 ); + strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ); + MultiByteToWideChar( cp, 0, str, count, strW, lenW ); + TRACE( "mapped %s -> %s\n", debugstr_an(str, count), debugstr_wn(strW, lenW) ); + if (plenW) *plenW = lenW; + if (ret_cp) *ret_cp = cp; + return strW; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ @@ -711,6 +741,104 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return ret; } +/*********************************************************************** + * ExtTextOutA (GDI32.@) + */ +BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, + const char *str, UINT count, const INT *dx ) +{ + INT wlen; + UINT codepage; + WCHAR *p; + BOOL ret; + INT *dxW = NULL; + + if (count > INT_MAX) return FALSE; + + if (flags & ETO_GLYPH_INDEX) + return ExtTextOutW( hdc, x, y, flags, rect, (const WCHAR *)str, count, dx ); + + p = text_mbtowc( hdc, str, count, &wlen, &codepage ); + + if (dx) + { + unsigned int i = 0, j = 0; + + /* allocate enough for a ETO_PDY */ + dxW = HeapAlloc( GetProcessHeap(), 0, 2 * wlen * sizeof(INT) ); + while (i < count) + { + if (IsDBCSLeadByteEx( codepage, str[i] )) + { + if (flags & ETO_PDY) + { + dxW[j++] = dx[i * 2] + dx[(i + 1) * 2]; + dxW[j++] = dx[i * 2 + 1] + dx[(i + 1) * 2 + 1]; + } + else + dxW[j++] = dx[i] + dx[i + 1]; + i = i + 2; + } + else + { + if (flags & ETO_PDY) + { + dxW[j++] = dx[i * 2]; + dxW[j++] = dx[i * 2 + 1]; + } + else + dxW[j++] = dx[i]; + i = i + 1; + } + } + } + + ret = ExtTextOutW( hdc, x, y, flags, rect, p, wlen, dxW ); + + HeapFree( GetProcessHeap(), 0, p ); + HeapFree( GetProcessHeap(), 0, dxW ); + return ret; +} + +/*********************************************************************** + * TextOutA (GDI32.@) + */ +BOOL WINAPI TextOutA( HDC hdc, INT x, INT y, const char *str, INT count ) +{ + return ExtTextOutA( hdc, x, y, 0, NULL, str, count, NULL ); +} + +/*********************************************************************** + * TextOutW (GDI32.@) + */ +BOOL WINAPI TextOutW( HDC hdc, INT x, INT y, const WCHAR *str, INT count ) +{ + return ExtTextOutW( hdc, x, y, 0, NULL, str, count, NULL ); +} + + +/*********************************************************************** + * PolyTextOutA (GDI32.@) + */ +BOOL WINAPI PolyTextOutA( HDC hdc, const POLYTEXTA *pt, INT count ) +{ + for (; count>0; count--, pt++) + if (!ExtTextOutA( hdc, pt->x, pt->y, pt->uiFlags, &pt->rcl, pt->lpstr, pt->n, pt->pdx )) + return FALSE; + return TRUE; +} + +/*********************************************************************** + * PolyTextOutW (GDI32.@) + */ +BOOL WINAPI PolyTextOutW( HDC hdc, const POLYTEXTW *pt, INT count ) +{ + for (; count>0; count--, pt++) + if (!ExtTextOutW( hdc, pt->x, pt->y, pt->uiFlags, &pt->rcl, pt->lpstr, pt->n, pt->pdx )) + return FALSE; + return TRUE; +} + static int kern_pair( const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2 ) { int i;

1 0

Jacek Caban : gdi32: Use NtGdiGetTextFaceW for GetTextFace.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: ff36618c969d46e6203ce66d053224b11dc6ee4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff36618c969d46e6203ce66d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:32 2021 +0200 gdi32: Use NtGdiGetTextFaceW for GetTextFace. 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 | 33 ++------------------------------- dlls/gdi32/text.c | 36 ++++++++++++++++++++++++++++++++++++ include/ntgdi.h | 2 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4d6f11d5080..ba1da3b11a9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4743,38 +4743,9 @@ BOOL WINAPI NtGdiSetTextJustification( HDC hdc, INT extra, INT breaks ) /*********************************************************************** - * GetTextFaceA (GDI32.@) + * NtGdiGetTextFaceW (win32u.@) */ -INT WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) -{ - INT res = GetTextFaceW(hdc, 0, NULL); - LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); - GetTextFaceW( hdc, res, nameW ); - - if (name) - { - if (count) - { - res = WideCharToMultiByte(CP_ACP, 0, nameW, -1, name, count, NULL, NULL); - if (res == 0) - res = count; - name[count-1] = 0; - /* GetTextFaceA does NOT include the nul byte in the return count. */ - res--; - } - else - res = 0; - } - else - res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL); - HeapFree( GetProcessHeap(), 0, nameW ); - return res; -} - -/*********************************************************************** - * GetTextFaceW (GDI32.@) - */ -INT WINAPI GetTextFaceW( HDC hdc, INT count, LPWSTR name ) +INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name, BOOL alias_name ) { PHYSDEV dev; INT ret; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 82bf709fe19..d8cd4fb0dda 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1052,3 +1052,39 @@ DWORD WINAPI GetCharacterPlacementA( HDC hdc, const char *str, INT count, INT ma HeapFree( GetProcessHeap(), 0, resultsW.lpOutString ); return ret; } + +/*********************************************************************** + * GetTextFaceA (GDI32.@) + */ +INT WINAPI GetTextFaceA( HDC hdc, INT count, char *name ) +{ + INT res = GetTextFaceW( hdc, 0, NULL ); + WCHAR *nameW = HeapAlloc( GetProcessHeap(), 0, res * sizeof(WCHAR) ); + + GetTextFaceW( hdc, res, nameW ); + if (name) + { + if (count) + { + res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, count, NULL, NULL ); + if (res == 0) res = count; + name[count - 1] = 0; + /* GetTextFaceA does NOT include the nul byte in the return count. */ + res--; + } + else + res = 0; + } + else + res = WideCharToMultiByte( CP_ACP, 0, nameW, -1, NULL, 0, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, nameW ); + return res; +} + +/*********************************************************************** + * GetTextFaceW (GDI32.@) + */ +INT WINAPI GetTextFaceW( HDC hdc, INT count, WCHAR *name ) +{ + return NtGdiGetTextFaceW( hdc, count, name, FALSE ); +} diff --git a/include/ntgdi.h b/include/ntgdi.h index cfcbce43fed..fd552cfa26d 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -238,7 +238,7 @@ DWORD WINAPI NtGdiGetRegionData( HRGN hrgn, DWORD count, RGNDATA *data ); INT WINAPI NtGdiGetRgnBox( HRGN hrgn, RECT *rect ); UINT WINAPI NtGdiGetSystemPaletteUse( HDC hdc ); UINT WINAPI NtGdiGetTextCharsetInfo( HDC hdc, FONTSIGNATURE *fs, DWORD flags ); -INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name ); +INT WINAPI NtGdiGetTextFaceW( HDC hdc, INT count, WCHAR *name, BOOL alias_name ); BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ); BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ); BOOL WINAPI NtGdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert,

1 0

Jacek Caban : gdi32: Use NtGdiGetTextExtentExPointW for GetTextExtentExPoint.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: c0486678ebb55cbb8beeed6cbbe59021daf205a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0486678ebb55cbb8beeed6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:41:56 2021 +0200 gdi32: Use NtGdiGetTextExtentExPointW for GetTextExtentExPoint. 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 | 215 +++--------------------------------------------------- dlls/gdi32/text.c | 95 ++++++++++++++++++++++++ include/ntgdi.h | 4 +- 3 files changed, 107 insertions(+), 207 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0486678ebb55cbb8bee…

1 0

Jacek Caban : gdi32: Store font code page in DC_ATTR.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 7ad7ec5b8b903733bc521cfdc1200bf4d76fb182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad7ec5b8b903733bc521cfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:24 2021 +0200 gdi32: Store font code page in DC_ATTR. 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/dc.c | 2 +- dlls/gdi32/font.c | 28 ++++++---------------------- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/text.c | 9 +++++++++ include/ntgdi.h | 1 + 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 51b754d1ccd..e4f643389d5 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -80,8 +80,8 @@ static void set_initial_dc_state( DC *dc ) dc->attr->vport_ext.cy = 1; dc->attr->miter_limit = 10.0f; /* 10.0 is the default, from MSDN */ dc->attr->layout = 0; - dc->font_code_page = CP_ACP; dc->attr->rop_mode = R2_COPYPEN; + dc->attr->font_code_page = CP_ACP; dc->attr->poly_fill_mode = ALTERNATE; dc->attr->stretch_blt_mode = BLACKONWHITE; dc->attr->rel_abs_mode = ABSOLUTE; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index bfb27ccd1af..e267190fb64 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4163,22 +4163,6 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, return TRUE; } -/*********************************************************************** - * GdiGetCodePage (GDI32.@) - */ -DWORD WINAPI GdiGetCodePage( HDC hdc ) -{ - UINT cp = CP_ACP; - DC *dc = get_dc_ptr( hdc ); - - if (dc) - { - cp = dc->font_code_page; - release_dc_ptr( dc ); - } - return cp; -} - /*********************************************************************** * get_text_charset_info * @@ -4457,14 +4441,14 @@ static void update_font_code_page( DC *dc, HANDLE font ) /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) - dc->font_code_page = csi.ciACP; + dc->attr->font_code_page = csi.ciACP; else { switch(charset) { case OEM_CHARSET: - dc->font_code_page = GetOEMCP(); + dc->attr->font_code_page = GetOEMCP(); break; case DEFAULT_CHARSET: - dc->font_code_page = GetACP(); + dc->attr->font_code_page = GetACP(); break; case VISCII_CHARSET: @@ -4481,17 +4465,17 @@ static void update_font_code_page( DC *dc, HANDLE font ) each of these, but since it's broken anyway we'll just use CP_ACP and hope it'll go away... */ - dc->font_code_page = CP_ACP; + dc->attr->font_code_page = CP_ACP; break; default: FIXME("Can't find codepage for charset %d\n", charset); - dc->font_code_page = CP_ACP; + dc->attr->font_code_page = CP_ACP; break; } } - TRACE("charset %d => cp %d\n", charset, dc->font_code_page); + TRACE( "charset %d => cp %d\n", charset, dc->attr->font_code_page ); } /*********************************************************************** diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 522bd51b6cc..91230666fad 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -99,7 +99,6 @@ typedef struct tagDC const struct font_gamma_ramp *font_gamma_ramp; - UINT font_code_page; INT breakExtra; /* breakTotalExtra / breakCount */ INT breakRem; /* breakTotalExtra % breakCount */ ABORTPROC pAbortProc; /* AbortProc for Printing */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 2d3902d2433..ffbc9806e78 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -737,6 +737,15 @@ static void text_metric_WtoA( const TEXTMETRICW *tmW, TEXTMETRICA *tmA ) tmA->tmCharSet = tmW->tmCharSet; } +/*********************************************************************** + * GdiGetCodePage (GDI32.@) + */ +DWORD WINAPI GdiGetCodePage( HDC hdc ) +{ + DC_ATTR *dc_attr = get_dc_attr( hdc ); + return dc_attr ? dc_attr->font_code_page : CP_ACP; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 52eb0767617..14808593501 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -156,6 +156,7 @@ typedef struct DC_ATTR SIZE vport_ext; /* viewport extent */ SIZE virtual_res; SIZE virtual_size; + UINT font_code_page; void *emf; } DC_ATTR;

1 0

Nikolay Sivov : oleaut32/typelib: Remove explicit check already handled by the loop condition.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 8ca5afa43046627bcc1acd0f465715397825ed1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ca5afa43046627bcc1acd0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 20 13:57:56 2021 +0300 oleaut32/typelib: Remove explicit check already handled by the loop condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0526af0abdb..ac326afe1a1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7216,7 +7216,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( UINT *pArgErr) { ITypeInfoImpl *This = impl_from_ITypeInfo2(iface); - int i; + int i, j; unsigned int var_index; TYPEKIND type_kind; HRESULT hres; @@ -7323,15 +7323,13 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( src_arg = NULL; - if (cNamedArgs) + for (j = 0; j < cNamedArgs; j++) { - USHORT j; - for (j = 0; j < cNamedArgs; j++) - if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) - { - src_arg = &pDispParams->rgvarg[j]; - break; - } + if (rgdispidNamedArgs[j] == i || (i == func_desc->cParams-1 && rgdispidNamedArgs[j] == DISPID_PROPERTYPUT)) + { + src_arg = &pDispParams->rgvarg[j]; + break; + } } if (!src_arg && vargs_converted + cNamedArgs < pDispParams->cArgs) @@ -7400,7 +7398,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { SAFEARRAYBOUND bound; VARIANT *v; - LONG j; + bound.lLbound = 0; bound.cElements = pDispParams->cArgs-i; if (!(a = SafeArrayCreate(VT_VARIANT, 1, &bound))) @@ -7585,7 +7583,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( i == func_desc->cParams-1) { SAFEARRAY *a = V_ARRAY(prgpvarg[i]); - LONG j, ubound; + LONG ubound; VARIANT *v; hres = SafeArrayGetUBound(a, 1, &ubound); if (hres != S_OK)

1 0

Jacek Caban : gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 6caf861a63403dd2a0b58237271d89cbc58af171 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6caf861a63403dd2a0b58237… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:10 2021 +0200 gdi32: Use NtGdiGetTextMetricsW for GetTextMetrics. 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 | 16 ++------------- dlls/gdi32/text.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 029990bf847..bfb27ccd1af 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4820,21 +4820,9 @@ BOOL WINAPI NtGdiGetTextExtentExW( HDC hdc, const WCHAR *str, INT count, INT max } /*********************************************************************** - * GetTextMetricsA (GDI32.@) + * NtGdiGetTextMetricsW (win32u.@) */ -BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) -{ - TEXTMETRICW tm32; - - if (!GetTextMetricsW( hdc, &tm32 )) return FALSE; - FONT_TextMetricWToA( &tm32, metrics ); - return TRUE; -} - -/*********************************************************************** - * GetTextMetricsW (GDI32.@) - */ -BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) +BOOL WINAPI NtGdiGetTextMetricsW( HDC hdc, TEXTMETRICW *metrics, ULONG flags ) { PHYSDEV physdev; BOOL ret = FALSE; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 86b58555ad5..2d3902d2433 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -699,6 +699,44 @@ static WCHAR *text_mbtowc( HDC hdc, const char *str, INT count, INT *plenW, UINT return strW; } +static void text_metric_WtoA( const TEXTMETRICW *tmW, TEXTMETRICA *tmA ) +{ + tmA->tmHeight = tmW->tmHeight; + tmA->tmAscent = tmW->tmAscent; + tmA->tmDescent = tmW->tmDescent; + tmA->tmInternalLeading = tmW->tmInternalLeading; + tmA->tmExternalLeading = tmW->tmExternalLeading; + tmA->tmAveCharWidth = tmW->tmAveCharWidth; + tmA->tmMaxCharWidth = tmW->tmMaxCharWidth; + tmA->tmWeight = tmW->tmWeight; + tmA->tmOverhang = tmW->tmOverhang; + tmA->tmDigitizedAspectX = tmW->tmDigitizedAspectX; + tmA->tmDigitizedAspectY = tmW->tmDigitizedAspectY; + tmA->tmFirstChar = min( tmW->tmFirstChar, 255 ); + if (tmW->tmCharSet == SYMBOL_CHARSET) + { + tmA->tmFirstChar = 0x1e; + tmA->tmLastChar = 0xff; /* win9x behaviour - we need the OS2 table data to calculate correctly */ + } + else if (tmW->tmPitchAndFamily & TMPF_TRUETYPE) + { + tmA->tmFirstChar = tmW->tmDefaultChar - 1; + tmA->tmLastChar = min( tmW->tmLastChar, 0xff ); + } + else + { + tmA->tmFirstChar = min( tmW->tmFirstChar, 0xff ); + tmA->tmLastChar = min( tmW->tmLastChar, 0xff ); + } + tmA->tmDefaultChar = tmW->tmDefaultChar; + tmA->tmBreakChar = tmW->tmBreakChar; + tmA->tmItalic = tmW->tmItalic; + tmA->tmUnderlined = tmW->tmUnderlined; + tmA->tmStruckOut = tmW->tmStruckOut; + tmA->tmPitchAndFamily = tmW->tmPitchAndFamily; + tmA->tmCharSet = tmW->tmCharSet; +} + /*********************************************************************** * ExtTextOutW (GDI32.@) */ @@ -1183,3 +1221,23 @@ BOOL WINAPI GetTextExtentPointW( HDC hdc, const WCHAR *str, INT count, SIZE *siz { return GetTextExtentPoint32W( hdc, str, count, size ); } + +/*********************************************************************** + * GetTextMetricsW (GDI32.@) + */ +BOOL WINAPI GetTextMetricsW( HDC hdc, TEXTMETRICW *metrics ) +{ + return NtGdiGetTextMetricsW( hdc, metrics, 0 ); +} + +/*********************************************************************** + * GetTextMetricsA (GDI32.@) + */ +BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics ) +{ + TEXTMETRICW tm32; + + if (!GetTextMetricsW( hdc, &tm32 )) return FALSE; + text_metric_WtoA( &tm32, metrics ); + return TRUE; +}

1 0

Alexandre Julliard : wow64: Fix function comments.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 4f4ddb57c2b964faf35b223217a22aecc313ff14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f4ddb57c2b964faf35b2232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 17:34:36 2021 +0200 wow64: Fix function comments. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 91f2a029e4b..0df1dfc143b 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -535,7 +535,7 @@ static LONG CALLBACK syscall_filter( EXCEPTION_POINTERS *ptrs ) /********************************************************************** - * Wow64SystemServiceEx (NTDLL.@) + * Wow64SystemServiceEx (wow64.@) */ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) { @@ -562,7 +562,7 @@ NTSTATUS WINAPI Wow64SystemServiceEx( UINT num, UINT *args ) /********************************************************************** - * Wow64AllocateTemp + * Wow64AllocateTemp (wow64.@) * * FIXME: probably not 100% compatible. */ @@ -579,7 +579,7 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ) /********************************************************************** - * Wow64ApcRoutine (NTDLL.@) + * Wow64ApcRoutine (wow64.@) */ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) { @@ -652,7 +652,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON /********************************************************************** - * Wow64LdrpInitialize (NTDLL.@) + * Wow64LdrpInitialize (wow64.@) */ void WINAPI Wow64LdrpInitialize( CONTEXT *context ) {

1 0

Alexandre Julliard : ntdll: Fix floating point exception codes in Wow64 mode.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 6da06c15417d7cf08b21d0e327471e7fd702c4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=6da06c15417d7cf08b21d0e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 20 11:33:46 2021 +0200 ntdll: Fix floating point exception codes in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index f541306d950..e6971b4629a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2694,7 +2694,10 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case FPE_FLTINV: default: - rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + if (FPU_sig(ucontext) && FPU_sig(ucontext)->StatusWord & 0x40) + rec.ExceptionCode = EXCEPTION_FLT_STACK_CHECK; + else + rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } @@ -2703,6 +2706,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 2; rec.ExceptionInformation[0] = 0; rec.ExceptionInformation[1] = FPU_sig(ucontext) ? FPU_sig(ucontext)->MxCsr : 0; + if (CS_sig(ucontext) != cs64_sel) rec.ExceptionCode = STATUS_FLOAT_MULTIPLE_TRAPS; } setup_exception( sigcontext, &rec ); }

1 0

Piotr Caban : msvcrt: Rename exception::what() implementation to exception_what.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: f1fa214b9f936bd91fecbfd6f05436d22311f4dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fa214b9f936bd91fecbfd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 20 18:44:35 2021 +0200 msvcrt: Rename exception::what() implementation to exception_what. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/cpp.c | 30 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrtd/msvcrtd.spec | 4 ++-- 10 files changed, 36 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1fa214b9f936bd91fec…

1 0

Jacek Caban : gdi32: Use NtGdiHfontCreate for CreateFont* functions.
by Alexandre Julliard Aug. 20, 2021

Aug. 20, 2021

Module: wine Branch: master Commit: 75786478c67a49c7ab960452fc5b1fd23b76051c URL: https://source.winehq.org/git/wine.git/?a=commit;h=75786478c67a49c7ab960452… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 20 10:42:44 2021 +0200 gdi32: Use NtGdiHfontCreate for CreateFont* functions. 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 | 129 ++------------------------------------------------ dlls/gdi32/text.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=75786478c67a49c7ab96…

1 0