wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Chip Davis : winemac.drv: Use a mask layer to support window regions.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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 +@interface CAShapeLayer (WineShapeMaskExtensions) + +@property(readonly, nonatomic, getter=isEmptyShaped) BOOL emptyShaped; + +@end + +@implementation CAShapeLayer (WineShapeMaskExtensions) + + - (BOOL) isEmptyShaped + { + return CGRectEqualToRect(CGPathGetBoundingBox(self.path), CGRectZero); + } + +@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; -@property (copy, nonatomic) NSBezierPath* shape; -@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

Chip Davis : winemac.drv: Enable layer-backed views.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: a5cf847aa45c38bae1500ef19a9bac38bbd8d5ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5cf847aa45c38bae1500ef1… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Sep 1 09:28:20 2021 -0500 winemac.drv: Enable layer-backed views. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 29ac32d6be0..29a5abe6344 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -311,6 +311,16 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @end +#ifndef MAC_OS_X_VERSION_10_14 +@protocol NSViewLayerContentScaleDelegate <NSObject> +@optional + + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window; + +@end +#endif + + @interface WineBaseView : NSView @end @@ -327,7 +337,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi #endif -@interface WineContentView : WineBaseView <NSTextInputClient> +@interface WineContentView : WineBaseView <NSTextInputClient, NSViewLayerContentScaleDelegate> { NSMutableArray* glContexts; NSMutableArray* pendingGlContexts; @@ -339,6 +349,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi NSMutableAttributedString* markedText; NSRange markedTextSelection; + BOOL _retinaMode; int backingSize[2]; #ifdef HAVE_METAL_METAL_H @@ -688,9 +699,15 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self setWantsBestResolutionOpenGLSurface:mode]; [self updateGLContexts]; + _retinaMode = !!mode; [super setRetinaMode:mode]; } + - (BOOL) layer:(CALayer*)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow*)window + { + return (_retinaMode || newScale == 1.0); + } + - (void) viewDidHide { [super viewDidHide]; @@ -1002,6 +1019,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi contentView = [[[WineContentView alloc] initWithFrame:NSZeroRect] autorelease]; if (!contentView) return nil; + [contentView setWantsLayer:YES]; [contentView setAutoresizesSubviews:NO]; /* We use tracking areas in addition to setAcceptsMouseMovedEvents:YES @@ -3573,6 +3591,7 @@ macdrv_view macdrv_create_view(CGRect rect) NSNotificationCenter* nc = [NSNotificationCenter defaultCenter]; view = [[WineContentView alloc] initWithFrame:NSRectFromCGRect(cgrect_mac_from_win(rect))]; + [view setWantsLayer:YES]; [view setAutoresizesSubviews:NO]; [view setAutoresizingMask:NSViewNotSizable]; [view setHidden:YES];

1 0

Francois Gouget : shlwapi/tests: Remove SHFormatDateTimeA() crash test.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 72843489857d85ff7b8d8fd52a42351e39f296cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=72843489857d85ff7b8d8fd5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 11:53:35 2021 +0200 shlwapi/tests: Remove SHFormatDateTimeA() crash test. SHFormatDateTimeA() crashes when given a NULL input pointer which is not really useful to know. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf34cdce7ef..bac91c4c9d8 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,12 +1674,6 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ - pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} - GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); /* SHFormatDateTime expects input as utc */

1 0

Francois Gouget : shlwapi/tests: Test a NULL flags pointer for SHFormatDateTime().
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: b1f4423bc1e305146f82d229ebab4d558131fe82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f4423bc1e305146f82d229… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 11:47:26 2021 +0200 shlwapi/tests: Test a NULL flags pointer for SHFormatDateTime(). It's equivalent to FDTF_DEFAULT. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..bf34cdce7ef 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1718,6 +1718,21 @@ if (0) ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + flags = FDTF_DEFAULT; + ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff)); + ok(ret == lstrlenA(buff)+1, "got %d\n", ret); + + buff2[0] = '\0'; + flags = FDTF_SHORTDATE | FDTF_SHORTTIME; + ret = pSHFormatDateTimeA(&filetime, &flags, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + + buff2[0] = '\0'; + ret = pSHFormatDateTimeA(&filetime, NULL, buff2, sizeof(buff2)); + ok(ret == lstrlenA(buff2)+1, "got %d\n", ret); + ok(lstrcmpA(buff, buff2) == 0, "expected (%s), got (%s)\n", buff, buff2); + /* now check returned strings */ flags = FDTF_NOAUTOREADINGORDER | FDTF_SHORTTIME; ret = pSHFormatDateTimeA(&filetime, &flags, buff, sizeof(buff));

1 0

Jacek Caban : gdi32: Move CombineTransform to objects.c.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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

Jacek Caban : gdi32: Copy TranslateCharsetInfo to text.c.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 7da78fd269309cfa8ed27aededb2c67e24507439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da78fd269309cfa8ed27aed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:52 2021 +0200 gdi32: Use ntgdi for AddFontResourceExW and RemoveFontResourceExW. 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 | 10 ++++++---- dlls/gdi32/text.c | 16 ++++++++++++++++ include/ntgdi.h | 4 ++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 99b018513d3..c5641cd4653 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6251,9 +6251,10 @@ void font_init(void) } /*********************************************************************** - * AddFontResourceExW (GDI32.@) + * NtGdiAddFontResourceW (win32u.@) */ -INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) +INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ) { int ret; WCHAR *filename; @@ -6344,9 +6345,10 @@ BOOL WINAPI NtGdiRemoveFontMemResourceEx( HANDLE handle ) } /*********************************************************************** - * RemoveFontResourceExW (GDI32.@) + * NtGdiRemoveFontResourceW (win32u.@) */ -BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD flags, PVOID pdv ) +BOOL WINAPI NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ) { int ret; WCHAR *filename; diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 227651f2afc..d1f7050e21a 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -2275,6 +2275,22 @@ BOOL WINAPI RemoveFontResourceExA( const char *str, DWORD fl, void *pdv ) return ret; } +/*********************************************************************** + * AddFontResourceExW (GDI32.@) + */ +INT WINAPI AddFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) +{ + return NtGdiAddFontResourceW( str, 0, 1, flags, 0, dv ); +} + +/*********************************************************************** + * RemoveFontResourceExW (GDI32.@) + */ +BOOL WINAPI RemoveFontResourceExW( const WCHAR *str, DWORD flags, void *dv ) +{ + return NtGdiRemoveFontResourceW( str, 0, 1, flags, 0, dv ); +} + /*********************************************************************** * GetFontResourceInfoW (GDI32.@) */ diff --git a/include/ntgdi.h b/include/ntgdi.h index 47777b3f129..00783975e18 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -210,6 +210,8 @@ INT WINAPI NtGdiAbortDoc( HDC hdc ); BOOL WINAPI NtGdiAbortPath( HDC hdc ); HANDLE WINAPI NtGdiAddFontMemResourceEx( void *ptr, DWORD size, void *dv, ULONG dv_size, DWORD *count ); +INT WINAPI NtGdiAddFontResourceW( const WCHAR *str, ULONG size, ULONG files, DWORD flags, + DWORD tid, void *dv ); 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 ); @@ -351,6 +353,8 @@ 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 NtGdiRemoveFontResourceW( const WCHAR *str, ULONG size, ULONG files, + DWORD flags, DWORD tid, void *dv ); 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: Use NtGdiAddFontMemResourceEx for AddFontMemResourceEx.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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: Use NtGdiEnumFonts for EnumFontFamiliesExW.
by Alexandre Julliard 01 Sep '21

01 Sep '21

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 EnumFontFamiliesExW for EnumFontFamiliesExA.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 931ea8b00e82912a96446575371e105cf1399496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=931ea8b00e82912a96446575… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 14:08:14 2021 +0200 gdi32: Use EnumFontFamiliesExW for EnumFontFamiliesExA. 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 | 119 +----------------------------------------------------- dlls/gdi32/text.c | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=931ea8b00e82912a9644…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021