September 2021 - Wine-Commits

Chip Davis : winemac.drv: Remove now unused -[WineContentView drawRect:].
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 3f845b34deada0dd58e3674119af47ce85851c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f845b34deada0dd58e36741… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:24 2021 -0500 winemac.drv: Remove now unused -[WineContentView drawRect:]. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 64 ----------------------------------------- 1 file changed, 64 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 85e13b5823f..eec750706a8 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -556,70 +556,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [pendingGlContexts removeAllObjects]; } - - (void) drawRect:(NSRect)rect - { - WineWindow* window = (WineWindow*)[self window]; - - if ([window contentView] != self) - return; - - if (window.surface && window.surface_mutex && - !pthread_mutex_lock(window.surface_mutex)) - { - const CGRect* rects; - int count; - - if (get_surface_blit_rects(window.surface, &rects, &count)) - { - CGRect dirtyRect = cgrect_win_from_mac(NSRectToCGRect(rect)); - NSAffineTransform* xform = [NSAffineTransform transform]; - CGContextRef context; - int i; - - [xform translateXBy:0.0 yBy:self.bounds.size.height]; - [xform scaleXBy:1.0 yBy:-1.0]; - [xform concat]; - - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; - CGContextSetBlendMode(context, kCGBlendModeCopy); - CGContextSetInterpolationQuality(context, retina_on ? kCGInterpolationHigh : kCGInterpolationNone); - - for (i = 0; i < count; i++) - { - CGRect imageRect; - CGImageRef image; - - imageRect = CGRectIntersection(rects[i], dirtyRect); - image = create_surface_image(window.surface, &imageRect, FALSE, window.colorKeyed, - window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue); - - if (image) - { - // Account for the flipped coordinate system. - imageRect = cgrect_mac_from_win(imageRect); - imageRect.origin.y = self.bounds.size.height - imageRect.origin.y - imageRect.size.height; - CGContextDrawImage(context, imageRect, image); - - CGImageRelease(image); - } - } - - [window windowDidDrawContent]; - } - - pthread_mutex_unlock(window.surface_mutex); - } - - // If the window may be transparent, then we have to invalidate the - // shadow every time we draw. Also, if this is the first time we've - // drawn since changing from transparent to opaque. - if (window.drawnSinceShown && (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw)) - { - window.shapeChangedSinceLastDraw = FALSE; - [window invalidateShadow]; - } - } - - (void) addGLContext:(WineOpenGLContext*)context { BOOL hadContext = _everHadGLContext;

1 0

Jacek Caban : gdi32: Use NtGdiEnumFonts for EnumFontFamiliesExW.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 865be24a2516518250badb5325220eacff2a126f URL: https://source.winehq.org/git/wine.git/?a=commit;h=865be24a2516518250badb53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:27 2021 +0200 gdi32: Use NtGdiEnumFonts for EnumFontFamiliesExW. 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 | 100 +++++++++++++++++++++++++----------------------------- dlls/gdi32/text.c | 43 +++++++++++++++++++++++ include/ntgdi.h | 9 +++++ 3 files changed, 98 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5e9cefa0c7d..ef57c4f9e49 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -196,15 +196,6 @@ typedef struct LOGFONTW logfont; } FONTOBJ; -struct font_enum -{ - LPLOGFONTW lpLogFontParam; - FONTENUMPROCW lpEnumFunc; - LPARAM lpData; - HDC hdc; - INT retval; -}; - /* * For TranslateCharsetInfo */ @@ -4315,64 +4306,65 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) } -/*********************************************************************** - * FONT_EnumInstance - * - * Note: plf is really an ENUMLOGFONTEXW, and ptm is a NEWTEXTMETRICEXW. - * We have to use other types because of the FONTENUMPROCW definition. - */ -static INT CALLBACK FONT_EnumInstance( const LOGFONTW *plf, const TEXTMETRICW *ptm, - DWORD fType, LPARAM lp ) +struct font_enum { - struct font_enum *pfe = (struct font_enum *)lp; - INT ret = 1; + HDC hdc; + struct font_enum_entry *buf; + ULONG size; + ULONG count; + ULONG charset; +}; + +static INT WINAPI font_enum_proc( const LOGFONTW *lf, const TEXTMETRICW *tm, + DWORD type, LPARAM lp ) +{ + struct font_enum *fe = (struct font_enum *)lp; - /* lfCharSet is at the same offset in both LOGFONTA and LOGFONTW */ - if ((!pfe->lpLogFontParam || - pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET || - pfe->lpLogFontParam->lfCharSet == plf->lfCharSet) && - (!(fType & RASTER_FONTTYPE) || GetDeviceCaps(pfe->hdc, TEXTCAPS) & TC_RA_ABLE) ) + if (fe->charset != DEFAULT_CHARSET && lf->lfCharSet != fe->charset) return 1; + if ((type & RASTER_FONTTYPE) && !(NtGdiGetDeviceCaps( fe->hdc, TEXTCAPS ) & TC_RA_ABLE)) + return 1; + + if (fe->buf && fe->count < fe->size) { - ret = pfe->lpEnumFunc( plf, ptm, fType, pfe->lpData ); - pfe->retval = ret; + fe->buf[fe->count].type = type; + fe->buf[fe->count].lf = *(const ENUMLOGFONTEXW *)lf; + fe->buf[fe->count].tm = *(const NEWTEXTMETRICEXW *)tm; } - return ret; + fe->count++; + return 1; } /*********************************************************************** - * FONT_EnumFontFamiliesEx + * NtGdiEnumFonts (win32u.@) */ -static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efproc, - LPARAM lParam ) +BOOL WINAPI NtGdiEnumFonts( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, + const WCHAR *face_name, ULONG charset, ULONG *count, void *buf ) { - INT ret = 0; - DC *dc = get_dc_ptr( hDC ); struct font_enum fe; + PHYSDEV physdev; + LOGFONTW lf; + BOOL ret; + DC *dc; - if (dc) - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pEnumFonts ); + if (!(dc = get_dc_ptr( hdc ))) return 0; - if (plf) TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), plf->lfCharSet); - fe.lpLogFontParam = plf; - fe.lpEnumFunc = efproc; - fe.lpData = lParam; - fe.hdc = hDC; - fe.retval = 1; - ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); - release_dc_ptr( dc ); - } - return ret ? fe.retval : 0; -} + memset( &lf, 0, sizeof(lf) ); + lf.lfCharSet = charset; + if (face_name_len) memcpy( lf.lfFaceName, face_name, face_name_len * sizeof(WCHAR) ); -/*********************************************************************** - * EnumFontFamiliesExW (GDI32.@) - */ -INT WINAPI EnumFontFamiliesExW( HDC hDC, LPLOGFONTW plf, - FONTENUMPROCW efproc, - LPARAM lParam, DWORD dwFlags ) -{ - return FONT_EnumFontFamiliesEx( hDC, plf, efproc, lParam ); + fe.hdc = hdc; + fe.buf = buf; + fe.size = *count / sizeof(*fe.buf); + fe.count = 0; + fe.charset = charset; + + physdev = GET_DC_PHYSDEV( dc, pEnumFonts ); + ret = physdev->funcs->pEnumFonts( physdev, &lf, font_enum_proc, (LPARAM)&fe ); + if (ret && buf) ret = fe.count <= fe.size; + *count = fe.count * sizeof(*fe.buf); + + release_dc_ptr( dc ); + return ret; } diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index d500a19a65a..8cc6ec25353 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2037,6 +2037,49 @@ BOOL WINAPI GdiRealizationInfo( HDC hdc, struct realization_info *info ) return TRUE; } +/*********************************************************************** + * EnumFontFamiliesExW (GDI32.@) + */ +INT WINAPI EnumFontFamiliesExW( HDC hdc, LOGFONTW *lf, FONTENUMPROCW efproc, + LPARAM lparam, DWORD flags ) +{ + struct font_enum_entry buf[32], *entries = buf; + const WCHAR *face_name = NULL; + DWORD charset, face_name_len = 0; + ULONG count, i; + INT ret = 1; + + if (lf) + { + if (lf->lfFaceName[0]) + { + face_name = lf->lfFaceName; + face_name_len = lstrlenW( face_name ); + } + charset = lf->lfCharSet; + } + else charset = DEFAULT_CHARSET; + + count = sizeof(buf); + if (!NtGdiEnumFonts( hdc, 0, 0, face_name_len, face_name, charset, &count, buf ) && + count <= sizeof(buf)) + return 0; + if (count > sizeof(buf)) + { + if (!(entries = HeapAlloc( GetProcessHeap(), 0, count ))) return 0; + ret = NtGdiEnumFonts( hdc, 0, 0, face_name_len, face_name, charset, &count, entries ); + } + count /= sizeof(*entries); + for (i = 0; ret && i < count; i++) + { + ret = efproc( (const LOGFONTW *)&entries[i].lf, (const TEXTMETRICW *)&entries[i].tm, + entries[i].type, lparam ); + } + + if (entries != buf) HeapFree( GetProcessHeap(), 0, entries ); + return ret; +} + struct enum_proc_paramsWtoA { LPARAM lparam; diff --git a/include/ntgdi.h b/include/ntgdi.h index f03b12a09ae..a3cf54d785a 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -171,6 +171,13 @@ typedef struct DC_ATTR void *emf; } DC_ATTR; +struct font_enum_entry +{ + DWORD type; + ENUMLOGFONTEXW lf; + NEWTEXTMETRICEXW tm; +}; + #endif /* __WINESRC__ */ struct font_realization_info @@ -259,6 +266,8 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGN INT WINAPI NtGdiExtGetObjectW( HGDIOBJ handle, INT count, void *buffer ); INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN region, INT mode ); BOOL WINAPI NtGdiFillRgn( HDC hdc, HRGN hrgn, HBRUSH hbrush ); +BOOL WINAPI NtGdiEnumFonts( HDC hdc, ULONG type, ULONG win32_compat, ULONG face_name_len, + const WCHAR *face_name, ULONG charset, ULONG *count, void *buf ); INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size, const char *input, INT output_size, char *output ); BOOL WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type );

1 0

Jacek Caban : gdi32: Use NtGdiAddFontMemResourceEx for AddFontMemResourceEx.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 8a68a9ee3193149c3f8825c31af7d5a6480f4ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a68a9ee3193149c3f8825c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:41 2021 +0200 gdi32: Use NtGdiAddFontMemResourceEx for AddFontMemResourceEx. 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 | 19 ++++++++++--------- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/text.c | 8 ++++++++ include/ntgdi.h | 3 +++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index ef57c4f9e49..99b018513d3 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6286,15 +6286,16 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) } /*********************************************************************** - * AddFontMemResourceEx (GDI32.@) + * NtGdiAddFontMemResourceEx (win32u.@) */ -HANDLE WINAPI AddFontMemResourceEx( PVOID ptr, DWORD size, PVOID pdv, DWORD *pcFonts ) +HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size, + DWORD *count ) { HANDLE ret; DWORD num_fonts; void *copy; - if (!ptr || !size || !pcFonts) + if (!ptr || !size || !count) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; @@ -6320,12 +6321,12 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID ptr, DWORD size, PVOID pdv, DWORD *pcF __TRY { - *pcFonts = num_fonts; + *count = num_fonts; } __EXCEPT_PAGE_FAULT { - WARN("page fault while writing to *pcFonts (%p)\n", pcFonts); - RemoveFontMemResourceEx( ret ); + WARN( "page fault while writing to *count (%p)\n", count ); + NtGdiRemoveFontMemResourceEx( ret ); ret = 0; } __ENDTRY @@ -6334,11 +6335,11 @@ HANDLE WINAPI AddFontMemResourceEx( PVOID ptr, DWORD size, PVOID pdv, DWORD *pcF } /*********************************************************************** - * RemoveFontMemResourceEx (GDI32.@) + * NtGdiRemoveFontMemResourceEx (win32u.@) */ -BOOL WINAPI RemoveFontMemResourceEx( HANDLE fh ) +BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ) { - FIXME("(%p) stub\n", fh); + FIXME( "(%p) stub\n", handle ); return TRUE; } diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 0e5c83926f8..569468bc3c1 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -414,7 +414,7 @@ @ stdcall RectInRegion(long ptr) NtGdiRectInRegion @ stdcall RectVisible(long ptr) NtGdiRectVisible @ stdcall Rectangle(long long long long long) -@ stdcall RemoveFontMemResourceEx(ptr) +@ stdcall RemoveFontMemResourceEx(ptr) NtGdiRemoveFontMemResourceEx @ stdcall RemoveFontResourceA(str) @ stdcall RemoveFontResourceExA(str long ptr) @ stdcall RemoveFontResourceExW(wstr long ptr) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 8cc6ec25353..227651f2afc 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2283,3 +2283,11 @@ BOOL WINAPI GetFontResourceInfoW( const WCHAR *str, DWORD *size, void *buffer, D FIXME( "%s %p(%d) %p %d\n", debugstr_w(str), size, size ? *size : 0, buffer, type ); return FALSE; } + +/*********************************************************************** + * AddFontMemResourceEx (GDI32.@) + */ +HANDLE WINAPI AddFontMemResourceEx( void *ptr, DWORD size, void *dv, DWORD *count ) +{ + return NtGdiAddFontMemResourceEx( ptr, size, dv, 0, count ); +} diff --git a/include/ntgdi.h b/include/ntgdi.h index a3cf54d785a..47777b3f129 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -208,6 +208,8 @@ struct font_fileinfo INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); +HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size, + DWORD *count ); BOOL WINAPI NtGdiAlphaBlend( HDC hdc_dst, int x_dst, int y_dst, int width_dst, int height_dst, HDC hdc_src, int x_src, int y_src, int width_src, int height_src, BLENDFUNCTION blend_function, HANDLE xform ); @@ -348,6 +350,7 @@ BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y ); BOOL WINAPI NtGdiRectInRegion( HRGN hrgn, const RECT *rect ); BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect ); BOOL WINAPI NtGdiRectangle( HDC hdc, INT left, INT top, INT right, INT bottom ); +BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ); BOOL WINAPI NtGdiResetDC( HDC hdc, const DEVMODEW *devmode, BOOL *banding, DRIVER_INFO_2W *driver_info, void *dev ); BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count );

1 0

Jacek Caban : gdi32: Copy TranslateCharsetInfo to text.c.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 00359ebfa0d4a86aac024f4067a82bb5725c94b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00359ebfa0d4a86aac024f40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:09:04 2021 +0200 gdi32: Copy TranslateCharsetInfo to text.c. And use a separated copy in ntgdi 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 | 96 +++++++++++++++++++--------------------------- dlls/gdi32/gdiobj.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 + dlls/gdi32/text.c | 82 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00359ebfa0d4a86aac02…

1 0

Jacek Caban : gdi32: Move CombineTransform to objects.c.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 34508690cb98f9d849cc04817db77400c62513c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34508690cb98f9d849cc0481… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:09:12 2021 +0200 gdi32: Move CombineTransform to objects.c. And use a separated copy in ntgdi 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/bitblt.c | 2 +- dlls/gdi32/dc.c | 52 +--------------------------------------------- dlls/gdi32/mapping.c | 22 ++++++++++++++++++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 24 +++++++++++++++++++++ 5 files changed, 48 insertions(+), 54 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 497e8a59f24..c10b9d37199 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -1070,7 +1070,7 @@ BOOL WINAPI PlgBlt( HDC hdcDest, const POINT *lpPoint, ) / det; GetWorldTransform(hdcSrc,&SrcXf); - CombineTransform(&xf,&xf,&SrcXf); + combine_transform( &xf, &xf, &SrcXf ); /* save actual dest transform */ GetWorldTransform(hdcDest,&oldDestXf); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 420754b555e..73b2e74174a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -366,8 +366,7 @@ void DC_UpdateXforms( DC *dc ) oldworld2vport = dc->xformWorld2Vport; /* Combine with the world transformation */ - CombineTransform( &dc->xformWorld2Vport, &dc->xformWorld2Wnd, - &xformWnd2Vport ); + combine_transform( &dc->xformWorld2Vport, &dc->xformWorld2Wnd, &xformWnd2Vport ); /* Create inverse of world-to-viewport transformation */ dc->vport2WorldValid = DC_InvertXform( &dc->xformWorld2Vport, @@ -933,55 +932,6 @@ BOOL WINAPI NtGdiGetTransform( HDC hdc, DWORD which, XFORM *xform ) } -/**************************************************************************** - * CombineTransform [GDI32.@] - * Combines two transformation matrices. - * - * PARAMS - * xformResult [O] Stores the result of combining the two matrices - * xform1 [I] Specifies the first matrix to apply - * xform2 [I] Specifies the second matrix to apply - * - * REMARKS - * The same matrix can be passed in for more than one of the parameters. - * - * RETURNS - * Success: TRUE. - * Failure: FALSE. Use GetLastError() to determine the cause. - */ -BOOL WINAPI CombineTransform( LPXFORM xformResult, const XFORM *xform1, - const XFORM *xform2 ) -{ - XFORM xformTemp; - - /* Check for illegal parameters */ - if (!xformResult || !xform1 || !xform2) - return FALSE; - - /* Create the result in a temporary XFORM, since xformResult may be - * equal to xform1 or xform2 */ - xformTemp.eM11 = xform1->eM11 * xform2->eM11 + - xform1->eM12 * xform2->eM21; - xformTemp.eM12 = xform1->eM11 * xform2->eM12 + - xform1->eM12 * xform2->eM22; - xformTemp.eM21 = xform1->eM21 * xform2->eM11 + - xform1->eM22 * xform2->eM21; - xformTemp.eM22 = xform1->eM21 * xform2->eM12 + - xform1->eM22 * xform2->eM22; - xformTemp.eDx = xform1->eDx * xform2->eM11 + - xform1->eDy * xform2->eM21 + - xform2->eDx; - xformTemp.eDy = xform1->eDx * xform2->eM12 + - xform1->eDy * xform2->eM22 + - xform2->eDy; - - /* Copy the result to xformResult */ - *xformResult = xformTemp; - - return TRUE; -} - - /*********************************************************************** * SetDCHook (win32u.@) * diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index db99d6a7eb7..00b8adf11b2 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -347,10 +347,12 @@ BOOL WINAPI NtGdiModifyWorldTransform( HDC hdc, const XFORM *xform, DWORD mode ) ret = TRUE; break; case MWT_LEFTMULTIPLY: - ret = CombineTransform( &dc->xformWorld2Wnd, xform, &dc->xformWorld2Wnd ); + combine_transform( &dc->xformWorld2Wnd, xform, &dc->xformWorld2Wnd ); + ret = TRUE; break; case MWT_RIGHTMULTIPLY: - ret = CombineTransform( &dc->xformWorld2Wnd, &dc->xformWorld2Wnd, xform ); + combine_transform( &dc->xformWorld2Wnd, &dc->xformWorld2Wnd, xform ); + ret = TRUE; break; case MWT_SET: ret = dc->attr->graphics_mode == GM_ADVANCED && @@ -414,3 +416,19 @@ BOOL WINAPI NtGdiSetVirtualResolution( HDC hdc, DWORD horz_res, DWORD vert_res, release_dc_ptr( dc ); return TRUE; } + +void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) +{ + XFORM r; + + /* Create the result in a temporary XFORM, since result may be + * equal to xform1 or xform2 */ + r.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; + r.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; + r.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; + r.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; + r.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; + r.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + + *result = r; +} diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 1463726d200..6701385784f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -409,6 +409,8 @@ extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern void lp_to_dp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; +extern void combine_transform( XFORM *result, const XFORM *xform1, + const XFORM *xform2 ) DECLSPEC_HIDDEN; /* metafile.c */ extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index d1d9cdb1e35..a79540885c3 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -977,3 +977,27 @@ INT WINAPI EnumObjects( HDC hdc, INT type, GOBJENUMPROC enum_func, LPARAM param return retval; } + +/*********************************************************************** + * CombineTransform (GDI32.@) + * + * Combines two transformation matrices. + */ +BOOL WINAPI CombineTransform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) +{ + XFORM r; + + if (!result || !xform1 || !xform2) return FALSE; + + /* Create the result in a temporary XFORM, since result may be + * equal to xform1 or xform2 */ + r.eM11 = xform1->eM11 * xform2->eM11 + xform1->eM12 * xform2->eM21; + r.eM12 = xform1->eM11 * xform2->eM12 + xform1->eM12 * xform2->eM22; + r.eM21 = xform1->eM21 * xform2->eM11 + xform1->eM22 * xform2->eM21; + r.eM22 = xform1->eM21 * xform2->eM12 + xform1->eM22 * xform2->eM22; + r.eDx = xform1->eDx * xform2->eM11 + xform1->eDy * xform2->eM21 + xform2->eDx; + r.eDy = xform1->eDx * xform2->eM12 + xform1->eDy * xform2->eM22 + xform2->eDy; + + *result = r; + return TRUE; +}

1 0

Chip Davis : winemac.drv: Use a mask layer to support window regions.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 01f027b2db3196a8fe43be3d6718227794362985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f027b2db3196a8fe43be3d… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:21 2021 -0500 winemac.drv: Use a mask layer to support window regions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 2 - dlls/winemac.drv/cocoa_window.m | 90 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 47 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index f9c3902dc36..d04961f8251 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -51,8 +51,6 @@ NSRect wineFrame; NSRect roundedWineFrame; - NSBezierPath* shape; - NSData* shapeData; BOOL shapeChangedSinceLastDraw; BOOL colorKeyed; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29a5abe6344..013af035a12 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -321,6 +321,22 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi #endif +(a)interface CAShapeLayer (WineShapeMaskExtensions) + +(a)property(readonly, nonatomic, getter=isEmptyShaped) BOOL emptyShaped; + +(a)end + +(a)implementation CAShapeLayer (WineShapeMaskExtensions) + + - (BOOL) isEmptyShaped + { + return CGRectEqualToRect(CGPathGetBoundingBox(self.path), CGRectZero); + } + +(a)end + + @interface WineBaseView : NSView @end @@ -388,8 +404,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (nonatomic) void* surface; @property (nonatomic) pthread_mutex_t* surface_mutex; -(a)property (copy, nonatomic) NSBezierPath* shape; -(a)property (copy, nonatomic) NSData* shapeData; @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -402,6 +416,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readonly, copy, nonatomic) NSArray* childWineWindows; + - (void) setShape:(CGPathRef)newShape; + - (void) updateForGLSubviews; - (BOOL) becameEligibleParentOrChild; @@ -494,17 +510,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (window.drawnSinceShown && window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) - { - [[NSColor clearColor] setFill]; - NSRectFill(rect); - - [window.shape addClip]; - - [[NSColor windowBackgroundColor] setFill]; - NSRectFill(rect); - } - if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { @@ -517,8 +522,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi CGContextRef context; int i; - [window.shape addClip]; - context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; CGContextSetBlendMode(context, kCGBlendModeCopy); CGContextSetInterpolationQuality(context, retina_on ? kCGInterpolationHigh : kCGInterpolationNone); @@ -968,7 +971,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize surface, surface_mutex; - @synthesize shape, shapeData, shapeChangedSinceLastDraw; + @synthesize shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; @@ -1069,8 +1072,6 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [queue release]; [latentChildWindows release]; [latentParentWindow release]; - [shape release]; - [shapeData release]; [super dealloc]; } @@ -2011,7 +2012,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) needsTransparency { - return self.shape || self.colorKeyed || self.usePerPixelAlpha || + return self.contentView.layer.mask || self.colorKeyed || self.usePerPixelAlpha || (gl_surface_mode == GL_SURFACE_BEHIND && [(WineContentView*)self.contentView hasGLDescendant]); } @@ -2033,22 +2034,27 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } - - (void) setShape:(NSBezierPath*)newShape + - (void) setShape:(CGPathRef)newShape { - if (shape == newShape) return; + CALayer* layer = [[self contentView] layer]; + CAShapeLayer* mask = (CAShapeLayer*)layer.mask; + if (CGPathEqualToPath(newShape, mask.path)) return; - if (shape) - { - [[self contentView] setNeedsDisplayInRect:[shape bounds]]; - [shape release]; - } + if (newShape && !layer.mask) + layer.mask = mask = [CAShapeLayer layer]; + else if (!newShape) + layer.mask = mask = nil; + + if (mask.path) + [[self contentView] setNeedsDisplayInRect:NSRectFromCGRect(CGPathGetBoundingBox(mask.path))]; if (newShape) - [[self contentView] setNeedsDisplayInRect:[newShape bounds]]; + [[self contentView] setNeedsDisplayInRect:NSRectFromCGRect(CGPathGetBoundingBox(newShape))]; - shape = [newShape copy]; + mask.path = newShape; self.shapeChangedSinceLastDraw = TRUE; [self checkTransparency]; + [self checkEmptyShaped]; } - (void) makeFocused:(BOOL)activate @@ -2245,7 +2251,8 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (BOOL) isEmptyShaped { - return (self.shapeData.length == sizeof(CGRectZero) && !memcmp(self.shapeData.bytes, &CGRectZero, sizeof(CGRectZero))); + CAShapeLayer* mask = (CAShapeLayer*)[[self contentView] layer].mask; + return ([mask isEmptyShaped]); } - (BOOL) canProvideSnapshot @@ -2648,8 +2655,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [transform scaleBy:scale]; - if (shape) - [shape transformUsingAffineTransform:transform]; + [[self contentView] layer].mask.contentsScale = mode ? 2.0 : 1.0; for (WineBaseView* subview in [self.contentView subviews]) { @@ -3453,25 +3459,19 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) OnMainThread(^{ if (!rects || !count) { - window.shape = nil; - window.shapeData = nil; + [window setShape:NULL]; [window checkEmptyShaped]; } else { - size_t length = sizeof(*rects) * count; - if (window.shapeData.length != length || memcmp(window.shapeData.bytes, rects, length)) - { - NSBezierPath* path; - unsigned int i; + CGMutablePathRef path; + unsigned int i; - path = [NSBezierPath bezierPath]; - for (i = 0; i < count; i++) - [path appendBezierPathWithRect:NSRectFromCGRect(cgrect_mac_from_win(rects[i]))]; - window.shape = path; - window.shapeData = [NSData dataWithBytes:rects length:length]; - [window checkEmptyShaped]; - } + path = CGPathCreateMutable(); + for (i = 0; i < count; i++) + CGPathAddRect(path, NULL, cgrect_mac_from_win(rects[i])); + [window setShape:path]; + CGPathRelease(path); } });

1 0

Francois Gouget : windowscodecs: Make the png_{de,en}coder_*() functions static.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 914b27bce5235980c3b3898bb0797415711c22ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=914b27bce5235980c3b3898b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:50:57 2021 +0200 windowscodecs: Make the png_{de,en}coder_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/libpng.c b/dlls/windowscodecs/libpng.c index 0571f5a2aad..6496fa36436 100644 --- a/dlls/windowscodecs/libpng.c +++ b/dlls/windowscodecs/libpng.c @@ -203,7 +203,7 @@ static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t lengt } } -HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) +static HRESULT CDECL png_decoder_initialize(struct decoder *iface, IStream *stream, struct decoder_stat *st) { struct png_decoder *This = impl_from_decoder(iface); png_structp png_ptr; @@ -484,14 +484,14 @@ end: return hr; } -HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) +static HRESULT CDECL png_decoder_get_frame_info(struct decoder *iface, UINT frame, struct decoder_frame *info) { struct png_decoder *This = impl_from_decoder(iface); *info = This->decoder_frame; return S_OK; } -HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, +static HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, const WICRect *prc, UINT stride, UINT buffersize, BYTE *buffer) { struct png_decoder *This = impl_from_decoder(iface); @@ -501,7 +501,7 @@ HRESULT CDECL png_decoder_copy_pixels(struct decoder *iface, UINT frame, prc, stride, buffersize, buffer); } -HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, +static HRESULT CDECL png_decoder_get_metadata_blocks(struct decoder* iface, UINT frame, UINT *count, struct decoder_block **blocks) { struct png_decoder *This = impl_from_decoder(iface); @@ -574,7 +574,7 @@ end: return hr; } -HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, +static HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, UINT num, BYTE **data, DWORD *datasize) { struct png_decoder *This = impl_from_decoder(iface); @@ -590,7 +590,7 @@ HRESULT CDECL png_decoder_get_color_context(struct decoder* iface, UINT frame, U return S_OK; } -void CDECL png_decoder_destroy(struct decoder* iface) +static void CDECL png_decoder_destroy(struct decoder* iface) { struct png_decoder *This = impl_from_decoder(iface); @@ -738,7 +738,7 @@ static HRESULT CDECL png_encoder_initialize(struct encoder *encoder, IStream *st return S_OK; } -HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) +static HRESULT CDECL png_encoder_get_supported_format(struct encoder* iface, GUID *pixel_format, DWORD *bpp, BOOL *indexed) { int i; @@ -869,7 +869,7 @@ static HRESULT CDECL png_encoder_create_frame(struct encoder *encoder, const str return S_OK; } -HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) +static HRESULT CDECL png_encoder_write_lines(struct encoder* encoder, BYTE *data, DWORD line_count, DWORD stride) { struct png_encoder *This = impl_from_encoder(encoder); jmp_buf jmpbuf;

1 0

Francois Gouget : wined3d: Make wined3d_context_vk_allocate_memory() static.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 4a5d95272c945bba494b6461bff9f3c354ef5a92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a5d95272c945bba494b6461… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:51:06 2021 +0200 wined3d: Make wined3d_context_vk_allocate_memory() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8df416851f2..705f789ed5f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -306,7 +306,7 @@ VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_cont return vk_memory; } -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, +static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6e9f3884724..86c053df0db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,6 @@ static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_conte void wined3d_context_vk_accumulate_pending_queries(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; void wined3d_context_vk_add_pending_query(struct wined3d_context_vk *context_vk, struct wined3d_query_vk *query_vk) DECLSPEC_HIDDEN; -struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct wined3d_context_vk *context_vk, - unsigned int memory_type, VkDeviceSize size, VkDeviceMemory *vk_memory) DECLSPEC_HIDDEN; bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, enum wined3d_query_type type, struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; VkDeviceMemory wined3d_context_vk_allocate_vram_chunk_memory(struct wined3d_context_vk *context_vk,

1 0

Eric Pouech : dbghelp: Tidy up internals for array type.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: 35c45857aeb39d8bf63863585aca553bd3496344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35c45857aeb39d8bf6386358… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 31 14:13:26 2021 +0200 dbghelp: Tidy up internals for array type. Mainly remove hackish storage of information with negative value and use a uniform min/count pair for all debug formats. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/dwarf.c | 12 ++++++------ dlls/dbghelp/msc.c | 10 +++++++++- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/type.c | 23 ++++------------------- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2906a5df6c3..2b0365bc386 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -254,7 +254,7 @@ struct symt_array { struct symt symt; int start; - int end; /* end index if > 0, or -array_len (in bytes) if < 0 */ + DWORD count; struct symt* base_type; struct symt* index_type; }; @@ -812,7 +812,7 @@ extern BOOL symt_add_enum_element(struct module* module, struct symt_enum* enum_type, const char* name, int value) DECLSPEC_HIDDEN; extern struct symt_array* - symt_new_array(struct module* module, int min, int max, + symt_new_array(struct module* module, int min, DWORD count, struct symt* base, struct symt* index) DECLSPEC_HIDDEN; extern struct symt_function_signature* symt_new_function_signature(struct module* module, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 375a0d6d728..93baf10ba44 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1266,7 +1266,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, /* FIXME: int4 even on 64bit machines??? */ idx_type = ctx->symt_cache[sc_int4]; min.u.uvalue = 0; - max.u.uvalue = -1; + cnt.u.uvalue = 0; } else for (i = 0; i < vector_length(children); i++) { @@ -1277,10 +1277,10 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, idx_type = dwarf2_lookup_type(ctx, child); if (!dwarf2_find_attribute(ctx, child, DW_AT_lower_bound, &min)) min.u.uvalue = 0; - if (!dwarf2_find_attribute(ctx, child, DW_AT_upper_bound, &max)) - max.u.uvalue = 0; - if (dwarf2_find_attribute(ctx, child, DW_AT_count, &cnt)) - max.u.uvalue = min.u.uvalue + cnt.u.uvalue; + if (dwarf2_find_attribute(ctx, child, DW_AT_upper_bound, &max)) + cnt.u.uvalue = max.u.uvalue + 1 - min.u.uvalue; + else if (!dwarf2_find_attribute(ctx, child, DW_AT_count, &cnt)) + cnt.u.uvalue = 0; break; default: FIXME("Unhandled Tag type 0x%lx at %s, for %s\n", @@ -1288,7 +1288,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, break; } } - di->symt = &symt_new_array(ctx->module, min.u.uvalue, max.u.uvalue, ref_type, idx_type)->symt; + di->symt = &symt_new_array(ctx->module, min.u.uvalue, cnt.u.uvalue, ref_type, idx_type)->symt; return di->symt; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 18535b9d151..905e3b0eaf1 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -671,8 +671,16 @@ static struct symt* codeview_add_type_array(struct codeview_type_parse* ctp, { struct symt* elem = codeview_fetch_type(ctp, elemtype, FALSE); struct symt* index = codeview_fetch_type(ctp, indextype, FALSE); + DWORD64 elem_size; + DWORD count = 0; - return &symt_new_array(ctp->module, 0, -arr_len, elem, index)->symt; + if (symt_get_info(ctp->module, elem, TI_GET_LENGTH, &elem_size) && elem_size) + { + if (arr_len % (DWORD)elem_size) + FIXME("array size should be a multiple of element size %u %u\n", arr_len, (DWORD)elem_size); + count = arr_len / (unsigned)elem_size; + } + return &symt_new_array(ctp->module, 0, count, elem, index)->symt; } static BOOL codeview_add_type_enum_field_list(struct module* module, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index f51ba962186..b011c123482 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -758,7 +758,7 @@ static inline int stabs_pts_read_array(struct ParseTypedefData* ptd, PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &base_dt) == -1); - *adt = &symt_new_array(ptd->module, lo, hi, base_dt, range_dt)->symt; + *adt = &symt_new_array(ptd->module, lo, hi - lo + 1, base_dt, range_dt)->symt; return 0; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 0fa3b669467..7ce85531162 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -350,7 +350,7 @@ BOOL symt_add_enum_element(struct module* module, struct symt_enum* enum_type, return TRUE; } -struct symt_array* symt_new_array(struct module* module, int min, int max, +struct symt_array* symt_new_array(struct module* module, int min, DWORD cnt, struct symt* base, struct symt* index) { struct symt_array* sym; @@ -359,7 +359,7 @@ struct symt_array* symt_new_array(struct module* module, int min, int max, { sym->symt.tag = SymTagArrayType; sym->start = min; - sym->end = max; + sym->count = cnt; sym->base_type = base; sym->index_type = index; symt_add_type(module, &sym->symt); @@ -367,21 +367,6 @@ struct symt_array* symt_new_array(struct module* module, int min, int max, return sym; } -static inline DWORD symt_array_count(struct module* module, const struct symt_array* array) -{ - if (array->end < 0) - { - DWORD64 elem_size; - /* One could want to also set the array->end field in array, but we won't do it - * as long as all the get_type() helpers use const objects - */ - if (symt_get_info(module, array->base_type, TI_GET_LENGTH, &elem_size) && elem_size) - return -array->end / (DWORD)elem_size; - return 0; - } - return array->end - array->start + 1; -} - struct symt_function_signature* symt_new_function_signature(struct module* module, struct symt* ret_type, enum CV_call_e call_conv) @@ -630,7 +615,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { case SymTagArrayType: - X(DWORD) = symt_array_count(module, (const struct symt_array*)type); + X(DWORD) = ((const struct symt_array*)type)->count; break; case SymTagFunctionType: /* this seems to be wrong for (future) C++ methods, where 'this' parameter @@ -676,7 +661,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, if (!symt_get_info(module, ((const struct symt_array*)type)->base_type, TI_GET_LENGTH, pInfo)) return FALSE; - X(DWORD64) *= symt_array_count(module, (const struct symt_array*)type); + X(DWORD64) *= ((const struct symt_array*)type)->count; break; case SymTagPublicSymbol: X(DWORD64) = ((const struct symt_public*)type)->size;

1 0

Chip Davis : winemac.drv: Move GL context update code to -viewWillDraw method.
by Alexandre Julliard Sept. 1, 2021

Sept. 1, 2021

Module: wine Branch: master Commit: cad2a7c8e1ad97eaf8bbb7479f8c5ad8dca8a10d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cad2a7c8e1ad97eaf8bbb747… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:22 2021 -0500 winemac.drv: Move GL context update code to -viewWillDraw method. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 013af035a12..677dc07ae16 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -491,9 +491,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi return YES; } - - (void) drawRect:(NSRect)rect + - (void) viewWillDraw { - WineWindow* window = (WineWindow*)[self window]; + [super viewWillDraw]; for (WineOpenGLContext* context in pendingGlContexts) { @@ -506,6 +506,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } [glContexts addObjectsFromArray:pendingGlContexts]; [pendingGlContexts removeAllObjects]; + } + + - (void) drawRect:(NSRect)rect + { + WineWindow* window = (WineWindow*)[self window]; if ([window contentView] != self) return;

1 0