Merge pull request #1273 from rajsesh-msft/cherry_pick_10_29

cherry-pick critical fixes for 11/7 release.

Author: Raj Seshasankaran

Frameworks/AudioToolbox/CAFDecoder.h

@@ -114,9 +114,6 @@ class CAFDecoder {
         int64_t mNumberValidFrames;
         int32_t mPrimingFrames;
         int32_t mRemainderFrames;
-
-        uint8_t mPacketDescriptions[1]; // this is a variable length array of
-        // mNumberPackets elements
     } CAFPacketTableHeader;
 
     typedef struct CAFDataChunk { uint32_t mEditCount; } CAFDataChunk;
@@ -142,7 +139,6 @@ class CAFDecoder {
     CAFAudioDescription cafDesc;
     CAFPacketTableHeader cafPacketTbl;
 
-    
     ChannelStateList channelStates;
 
 public:

Frameworks/AudioToolbox/CAFDecoder.mm

@@ -213,7 +213,7 @@ uint64_t int64Swap(uint64_t val) {
     //  clamp the number of packets to produce based on what is available in the
     //  input buffer
     UInt32 inputPacketSize = mInputFormat.mBytesPerPacket;
-    UInt32 numberOfInputPackets = 1;
+    UInt32 numberOfInputPackets = ([stream hasBytesAvailable] ? 1 : 0);
     if (ioNumberPackets < numberOfInputPackets) {
         numberOfInputPackets = ioNumberPackets;
     } else if (ioNumberPackets > numberOfInputPackets) {
@@ -267,7 +267,7 @@ uint64_t int64Swap(uint64_t val) {
     isPcm = false;
 
     while ([inStream hasBytesAvailable] && !stop) {
-        CAFChunkHeader chunkHeader;
+        CAFChunkHeader chunkHeader{};
         [inStream read:(uint8_t*)&chunkHeader maxLength:sizeof(CAFChunkHeader)];
         chunkHeader.mChunkType = int32Swap(chunkHeader.mChunkType);
         chunkHeader.mChunkSize = int64Swap(chunkHeader.mChunkSize);
@@ -331,13 +331,16 @@ uint64_t int64Swap(uint64_t val) {
                 break;
 
             default:
-                bytesToSkip.reserve(chunkHeader.mChunkSize);
-                bytesLeftUntilChunkEnd -= [inStream read:(uint8_t*)&bytesToSkip[0] maxLength:chunkHeader.mChunkSize];
+                if (chunkHeader.mChunkSize > 0) {
+                    bytesToSkip.resize(chunkHeader.mChunkSize);
+                    bytesLeftUntilChunkEnd -= [inStream read:(uint8_t*)&bytesToSkip[0] maxLength:chunkHeader.mChunkSize];
+                }
                 break;
         }
 
         if (!stop) {
             if (bytesLeftUntilChunkEnd > 0) {
+                bytesToSkip.resize(bytesLeftUntilChunkEnd);
                 [inStream read:(uint8_t*)&bytesToSkip[0] maxLength:bytesLeftUntilChunkEnd];
             }
         }

Frameworks/CoreGraphics/CGContextCairo.mm

@@ -1860,25 +1860,26 @@
     // Technically there should be a horizontal translation to the center as well,
     // but it's to the center of _each individual glyph_, as the reference platform applies the text matrix to each glyph individually
     // Uncertain whether it's ever going to be worth it to support this using DWrite, so just ignore it for now
-    CGAffineTransform transform = CGAffineTransformMake(1, 0, 0, -1, 0, lineAscent / 2.0f);
+    CGAffineTransform transform = CGAffineTransformMake(1, 0, 0, -1, 0, -lineAscent / 2.0f);
 
     // Apply text transforms
     transform = CGAffineTransformConcat(curState->curTextMatrix, transform);
-    transform = CGAffineTransformTranslate(transform, curState->curTextPosition.x, curState->curTextPosition.y);
 
     // Undo transform to text space
-    transform = CGAffineTransformConcat(CGAffineTransformMake(1, 0, 0, -1, 0, -lineAscent / 2.0f), transform);
+    transform = CGAffineTransformConcat(CGAffineTransformMake(1, 0, 0, -1, 0, lineAscent / 2.0f), transform);
 
-    // Apply the context CTM
-    transform = CGAffineTransformConcat(curState->curTransform, transform);
+    transform = CGAffineTransformTranslate(transform, curState->curTextPosition.x, curState->curTextPosition.y);
 
-    // Perform translation required to handle scaling.
-    CGFloat verticalScalingFactor = sqrt((transform.b * transform.b) + (transform.d * transform.d));
+    // Find transform that user created by multiplying given transform by necessary transforms to draw with CoreText
     float height = _imgDest->Backing()->Height();
-    transform = CGAffineTransformTranslate(transform, 0, (height / verticalScalingFactor));
+    CGAffineTransform userTransform =
+        CGAffineTransformConcat(curState->curTransform, CGAffineTransformMake(1.0f / _scale, 0, 0, 1.0f / _scale, 0, -height / _scale));
+
+    // Apply the context CTM
+    transform = CGAffineTransformConcat(transform, userTransform);
 
     // Perform anti-clockwise rotation required to match the reference platform.
-    imgRenderTarget->SetTransform(D2D1::Matrix3x2F(transform.a, -transform.b, transform.c, transform.d, transform.tx, transform.ty));
+    imgRenderTarget->SetTransform(D2D1::Matrix3x2F(transform.a, -transform.b, transform.c, transform.d, transform.tx, -transform.ty));
 
     // Draw the glyph using ID2D1RenderTarget
     ComPtr<ID2D1SolidColorBrush> brush;

Frameworks/CoreGraphics/DWriteWrapper.mm

@@ -395,6 +395,14 @@ HRESULT _DWriteCreateFontFaceWithName(CFStringRef name, IDWriteFontFace** outFon
     // Eg: Bold, Condensed, Light, Italic
     _DWriteFontProperties properties = _DWriteGetFontPropertiesFromName(name);
 
+    // TODO: #1250: Need to be able to load fonts from the app's bundle
+    // For now return a default font to avoid crashes in case of missing fonts
+    // When #1250 is completed, remove this
+    if (!properties.familyName) {
+        name = CFSTR("Segoe UI");
+        properties = _DWriteGetFontPropertiesFromName(name);
+    }
+
     RETURN_HR_IF_NULL(E_INVALIDARG, properties.familyName);
 
     ComPtr<IDWriteFontFamily> fontFamily;

Frameworks/CoreText/CTFrame.mm

@@ -122,7 +122,7 @@ void CTFrameDraw(CTFrameRef frameRef, CGContextRef ctx) {
         CGContextScaleCTM(ctx, 1.0f, -1.0f);
 
         for (_CTLine* line in static_cast<id<NSFastEnumeration>>(frame->_lines)) {
-            CGContextSetTextPosition(ctx, line->_lineOrigin.x, line->_lineOrigin.y);
+            CGContextSetTextPosition(ctx, line->_lineOrigin.x, -line->_lineOrigin.y);
             _CTLineDraw(static_cast<CTLineRef>(line), ctx, false);
         }
 

Frameworks/CoreText/CTLine.mm

@@ -221,10 +221,10 @@ void _CTLineDraw(CTLineRef lineRef, CGContextRef ctx, bool adjustTextPosition) {
     }
 
     _CTLine* line = static_cast<_CTLine*>(lineRef);
-    CGPoint curTextPos = { 0, 0 };
+    CGPoint curTextPos = {};
     if (adjustTextPosition) {
         curTextPos = CGContextGetTextPosition(ctx);
-        CGContextSetTextPosition(ctx, curTextPos.x + line->_relativeXOffset, curTextPos.y + line->_relativeYOffset);
+        CGContextSetTextPosition(ctx, curTextPos.x, curTextPos.y + line->_relativeYOffset);
     }
 
     for (size_t i = 0; i < [line->_runs count]; ++i) {

Frameworks/CoreText/CTRun.mm

@@ -277,7 +277,7 @@ void _CTRunDraw(CTRunRef run, CGContextRef ctx, CFRange textRange, bool adjustTe
 
     if (adjustTextPosition) {
         CGPoint curTextPos = CGContextGetTextPosition(ctx);
-        CGContextSetTextPosition(ctx, curTextPos.x + curRun->_relativeXOffset, curTextPos.y + curRun->_relativeYOffset);
+        CGContextSetTextPosition(ctx, curTextPos.x, curTextPos.y + curRun->_relativeYOffset);
     }
 
     id fontColor = [curRun->_attributes objectForKey:(id)kCTForegroundColorAttributeName];

Frameworks/CoreText/DWriteWrapper_CoreText.mm

@@ -455,7 +455,7 @@ HRESULT STDMETHODCALLTYPE GetPixelsPerDip(_In_opt_ void* clientDrawingContext, _
             i++;
         }
 
-        if ([runs objectAtIndex:0]) {
+        if ([runs count] > 0) {
             prevYPosForDraw = yPos;
             line->_runs = runs;
             line->_strRange.location = static_cast<_CTRun*>(line->_runs[0])->_range.location;

Frameworks/QuartzCore/CALayer.mm

@@ -623,10 +623,9 @@ - (void)display {
             CGContextTranslateCTM(drawContext, 0, float(target->Backing()->Height()));
         }
         if (priv->contentsScale != 1.0f) {
-            CGContextScaleCTM(drawContext, priv->contentsScale, priv->contentsScale);
-
             // TODO 1077:: Remove once D2D render target is implemented
             _CGContextSetScaleFactor(drawContext, priv->contentsScale);
+            CGContextScaleCTM(drawContext, priv->contentsScale, priv->contentsScale);
         }
 
         CGContextScaleCTM(drawContext, 1.0f, -1.0f);
@@ -2133,11 +2132,11 @@ - (BOOL)containsPoint:(CGPoint)point {
 - (void)dealloc {
     if (DEBUG_VERBOSE) {
         TraceVerbose(TAG,
-            L"CALayer dealloc: (%hs - 0x%p, %hs - 0x%p).",
-            object_getClassName(self),
-            self,
-            priv->delegate ? object_getClassName(priv->delegate) : "nil",
-            priv->delegate);
+                     L"CALayer dealloc: (%hs - 0x%p, %hs - 0x%p).",
+                     object_getClassName(self),
+                     self,
+                     priv->delegate ? object_getClassName(priv->delegate) : "nil",
+                     priv->delegate);
     }
 
     [self removeAllAnimations];
@@ -2400,63 +2399,58 @@ - (void)_displayChanged {
         //////////////////////////////////////////////////////////////////////////////////////////////
         // TODO: Switch to ARC
         // We don't want to do display updates on an object that's currently deallocating.
-        // In order to ensure that we're not mid-deallocation during the display update, 
+        // In order to ensure that we're not mid-deallocation during the display update,
         // we create a weak reference here, and then *immediately* acquire a strong reference to it.
         // If that succeeds, we're guaranteed to not dealloc until after the block executes.
-        
+
         // Store a weak reference - this will fail if we're already deallocating
         id weakSuperLayer = nil;
         objc_storeWeak(&weakSuperLayer, superLayer);
-        
+
         // Grab a strong reference that we can pass into the block - this will fail if we're already deallocating
         auto strongSuperLayer = reinterpret_cast<CALayer*>(objc_loadWeakRetained(&weakSuperLayer));
-        
+
         // We need to make sure the retain we just performed above is released *after* we construct the block
-        auto releaseSuperLayer = wil::ScopeExit([&strongSuperLayer]() { 
-            objc_release(strongSuperLayer); 
-        });
+        auto releaseSuperLayer = wil::ScopeExit([&strongSuperLayer]() { objc_release(strongSuperLayer); });
 
         // The weak reference is no longer needed, so clean up after ourselves
         objc_destroyWeak(&weakSuperLayer);
 
         // Grab a raw pointer (so it's not block-retained) - for logging purposes (if needed)
         void* rawSuperLayerForLog = reinterpret_cast<void*>(superLayer);
 
-        dispatch_async(
-            dispatch_get_main_queue(),
-            ^{
-                // If we have a valid non-dealloc'd object, run its display update pass
-                if (strongSuperLayer) {
-                    // Only run the update pass for this superLayer if it's a 'root layer' - aka a UIWindow layer,
-                    // or if we're running as a framework - aka for middleware scenarios - where the layer won't have
-                    // a 'root' superlayer.
-                    if (strongSuperLayer->priv->isRootLayer || GetCACompositor()->IsRunningAsFramework()) {
-                        strongSuperLayer->priv->_displayPending = false;
-
-                        if (DEBUG_VERBOSE) {
-                            TraceVerbose(
-                                TAG,
-                                L"Performing _displayChanged work for superlayer (%hs - 0x%p, %hs - 0x%p).",
-                                object_getClassName(strongSuperLayer),
-                                strongSuperLayer,
-                                strongSuperLayer->priv->delegate ? object_getClassName(strongSuperLayer->priv->delegate) : "nil",
-                                strongSuperLayer->priv->delegate);
-                        }
-
-                        // Recalculate layouts
-                        DoLayerLayouts(strongSuperLayer, true);
-
-                        // Redisplay anything necessary
-                        DoDisplayList(strongSuperLayer);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            // If we have a valid non-dealloc'd object, run its display update pass
+            if (strongSuperLayer) {
+                // Only run the update pass for this superLayer if it's a 'root layer' - aka a UIWindow layer,
+                // or if we're running as a framework - aka for middleware scenarios - where the layer won't have
+                // a 'root' superlayer.
+                if (strongSuperLayer->priv->isRootLayer || GetCACompositor()->IsRunningAsFramework()) {
+                    strongSuperLayer->priv->_displayPending = false;
+
+                    if (DEBUG_VERBOSE) {
+                        TraceVerbose(TAG,
+                                     L"Performing _displayChanged work for superlayer (%hs - 0x%p, %hs - 0x%p).",
+                                     object_getClassName(strongSuperLayer),
+                                     strongSuperLayer,
+                                     strongSuperLayer->priv->delegate ? object_getClassName(strongSuperLayer->priv->delegate) : "nil",
+                                     strongSuperLayer->priv->delegate);
                     }
-                } else if (DEBUG_VERBOSE) {
-                    TraceVerbose(TAG, L"Skipping _displayChanged work for currently-dealloc'd object (0x%p).", rawSuperLayerForLog);
+
+                    // Recalculate layouts
+                    DoLayerLayouts(strongSuperLayer, true);
+
+                    // Redisplay anything necessary
+                    DoDisplayList(strongSuperLayer);
                 }
+            } else if (DEBUG_VERBOSE) {
+                TraceVerbose(TAG, L"Skipping _displayChanged work for currently-dealloc'd object (0x%p).", rawSuperLayerForLog);
+            }
 
-                // Always commit and process all queued CATransactions
-                [CATransaction _commitRootQueue];
-                GetCACompositor()->ProcessTransactions();
-            });
+            // Always commit and process all queued CATransactions
+            [CATransaction _commitRootQueue];
+            GetCACompositor()->ProcessTransactions();
+        });
     }
 }
 
@@ -2592,7 +2586,7 @@ + (CGPoint)convertPoint:(CGPoint)point fromLayer:(CALayer*)fromLayer toLayer:(CA
     }
 
     if (DEBUG_VERBOSE) {
-        TraceVerbose(TAG, L"convertPoint: {%f, %f} to {%f, %f}",  point.x, point.y, ret.x, ret.y);
+        TraceVerbose(TAG, L"convertPoint: {%f, %f} to {%f, %f}", point.x, point.y, ret.x, ret.y);
     }
 
     return ret;

Frameworks/UIKit/NSLayoutManager.mm

@@ -156,7 +156,7 @@ - (void)__layoutAllText {
 
             // Save line and origin for when it is drawn
             [_ctLines addObject:(id)fitLine];
-            _lineOrigins.push_back(rect.origin);
+            _lineOrigins.emplace_back(CGPoint{ rect.origin.x, rect.origin.y + lineHeight });
 
             double fitWidth = CTLineGetTypographicBounds(fitLine, nullptr, nullptr, nullptr);
             drawnWidth += fitWidth;
@@ -245,12 +245,11 @@ - (void)drawGlyphsForGlyphRange:(NSRange)range atPoint:(CGPoint)position {
     int count = [_ctLines count];
     for (int curLine = 0; curLine < count; curLine++) {
         CTLineRef line = (CTLineRef)_ctLines[curLine];
-
-        float ascent, descent, leading;
-        CTLineGetTypographicBounds(line, &ascent, &descent, &leading);
-
         CGContextSaveGState(curCtx);
-        CGContextSetTextPosition(curCtx, _lineOrigins[curLine].x, _lineOrigins[curLine].y);
+
+        CGFloat ascent, leading;
+        CTLineGetTypographicBounds(line, &ascent, nullptr, &leading);
+        CGContextSetTextPosition(curCtx, _lineOrigins[curLine].x, -(_lineOrigins[curLine].y + ascent + leading));
         CTLineDraw(line, curCtx);
         CGContextRestoreGState(curCtx);
     }
@@ -745,10 +744,10 @@ - (void)ensureLayoutForTextContainer:(NSTextContainer*)container {
  @Notes
 */
 - (void)setGlyphs:(const CGGlyph*)glyphs
-       properties:(const NSGlyphProperty*)props
- characterIndexes:(const NSUInteger*)charIndexes
-             font:(UIFont*)aFont
-    forGlyphRange:(NSRange)glyphRange {
+          properties:(const NSGlyphProperty*)props
+    characterIndexes:(const NSUInteger*)charIndexes
+                font:(UIFont*)aFont
+       forGlyphRange:(NSRange)glyphRange {
     UNIMPLEMENTED();
 }