Merge remote-tracking branch 'origin/master' into github

microsoft · Dec 19, 2015 · a31d746 · a31d746
2 parents 44d4edc + ceeb459
commit a31d746
Show file tree

Hide file tree

Showing 213 changed files with 10,483 additions and 7,923 deletions.
diff --git a/Frameworks/AVFoundation/AVAudioConstants.mm b/Frameworks/AVFoundation/AVAudioConstants.mm
@@ -16,7 +16,13 @@
 
 #import <AVFoundation/AVFoundation.h>
 
-extern "C" NSString* const AVAudioSessionCategoryAmbient = (NSString * const) @"AVAudioSessionCategoryAmbient";
-extern "C" NSString* const AVAudioSessionCategoryPlayback = (NSString * const) @"AVAudioSessionCategoryPlayback";
-extern "C" NSString* const AVAudioSessionCategoryPlayAndRecord = (NSString * const) @"AVAudioSessionCategoryPlayAndRecord";
-extern "C" NSString* const AVAudioSessionCategorySoloAmbient = (NSString * const) @"AVAudioSessionCategorySoloAmbient";
+extern "C" NSString* const AVAudioSessionCategoryAmbient = @"AVAudioSessionCategoryAmbient";
+extern "C" NSString* const AVAudioSessionCategoryPlayback = @"AVAudioSessionCategoryPlayback";
+extern "C" NSString* const AVAudioSessionCategoryPlayAndRecord = @"AVAudioSessionCategoryPlayAndRecord";
+extern "C" NSString* const AVAudioSessionCategorySoloAmbient = @"AVAudioSessionCategorySoloAmbient";
+
+extern "C" NSString* const AVAudioSessionInterruptionTypeKey = @"AVAudioSessionInterruptionTypeKey";
+extern "C" NSString* const AVAudioSessionInterruptionOptionKey = @"AVAudioSessionInterruptionOptionKey";
+extern "C" NSString* const AVAudioSessionRouteChangeReasonKey = @"AVAudioSessionRouteChangeReasonKey";
+extern "C" NSString* const AVAudioSessionRouteChangePreviousRouteKey = @"AVAudioSessionRouteChangePreviousRouteKey";
+extern "C" NSString* const AVAudioSessionSilenceSecondaryAudioHintTypeKey = @"AVAudioSessionSilenceSecondaryAudioHintTypeKey";
diff --git a/Frameworks/CoreFoundation/CFConstants.mm b/Frameworks/CoreFoundation/CFConstants.mm
@@ -23,3 +23,5 @@
 const CFStringRef kCFBundleNameKey = (const CFStringRef) @"CFBundleName";
 
 CFAllocatorRef const kCFAllocatorDefault = 0;
+
+double kCFCoreFoundationVersionNumber = kCFCoreFoundationVersionNumber_iOS_6_0;
diff --git a/Frameworks/CoreFoundation/CFNumber.mm b/Frameworks/CoreFoundation/CFNumber.mm
@@ -26,7 +26,6 @@
 */
 CFNumberType CFNumberGetType(CFNumberRef self) {
     UNIMPLEMENTED();
-    assert(0);
     return kCFNumberIntType;
 }
 

diff --git a/Frameworks/CoreFoundation/CFString.mm b/Frameworks/CoreFoundation/CFString.mm
@@ -14,6 +14,7 @@
 //
 //******************************************************************************
 
+#include "Starboard.h"
 #import <Foundation/Foundation.h>
 
 /**
@@ -99,3 +100,11 @@ CFComparisonResult CFStringCompare(CFStringRef self, CFStringRef other, CFOption
 CFIndex CFStringGetLength(CFStringRef self) {
     return [(NSString*)self length];
 }
+
+/**
+ @Status Stub
+*/
+CFStringEncoding CFStringGetFastestEncoding(CFStringRef self) {
+    UNIMPLEMENTED();
+    return 0;
+}
diff --git a/Frameworks/CoreFoundation/CFType.mm b/Frameworks/CoreFoundation/CFType.mm
@@ -31,6 +31,13 @@ void CFRelease(CFTypeRef obj) {
     objc_release_ref((id)obj);
 }
 
+/**
+ @Status Interoperable
+*/
+void CFAutorelease(CFTypeRef obj) {
+    [obj autorelease];
+}
+
 /**
  @Status Interoperable
 */
@@ -113,6 +120,7 @@ DWORD _NSSetLogCStringFunction(DWORD func) {
 CFBooleanType,
 CGLayerType,
 CFBundleType,
+CFBinaryHeap,
 } CFTypeIDs;
 
 DWORD CFGetTypeID(id cfobj)
@@ -124,6 +132,9 @@ DWORD CFGetTypeID(id cfobj)
 if ( [objType isKindOfClass:[NSDictionary class]] ) {
 return CFDictionaryType;
 }
+if ( [objType isKindOfClass:[CFBinaryHeap class]] ) {
+return CFBinaryHeap;
+}
 if ( [objType isKindOfClass:[NSArray class]] ) {
 return CFArrayType;
 }
@@ -145,6 +156,11 @@ DWORD CFGetTypeID(id cfobj)
 return 0;
 }
 
+DWORD CFBinaryHeapGetTypeID()
+{
+return CFBinaryHeap;
+}
+
 DWORD CFDictionaryGetTypeID()
 {
 return CFDictionaryType;

diff --git a/Frameworks/CoreFoundation/CFURL.mm b/Frameworks/CoreFoundation/CFURL.mm
@@ -94,3 +94,30 @@ CFStringRef CFURLCreateStringByAddingPercentEscapes(CFAllocatorRef allocator,
 CFStringRef CFURLCopyPathExtension(CFURLRef self) {
     return (CFStringRef)[[[(NSURL*)self path] pathExtension] retain];
 }
+
+/**
+ @Status Stub
+*/
+CFStringRef CFURLCreateStringByReplacingPercentEscapes(CFAllocatorRef allocator, CFStringRef string, CFStringRef charactersToLeaveEscaped) {
+    UNIMPLEMENTED();
+    return nil;
+}
+
+/**
+ @Status Stub
+*/
+CFStringRef CFURLCreateStringByReplacingPercentEscapesUsingEncoding(CFAllocatorRef allocator,
+                                                                    CFStringRef string,
+                                                                    CFStringRef charactersToLeaveEscaped,
+                                                                    CFStringEncoding encoding) {
+    UNIMPLEMENTED();
+    return nil;
+}
+
+/**
+ @Status Stub
+*/
+CFStringRef CFURLCopyPath(CFURLRef self) {
+    UNIMPLEMENTED();
+    return nil;
+}
diff --git a/Frameworks/CoreGraphics/CGFont.mm b/Frameworks/CoreGraphics/CGFont.mm
@@ -18,6 +18,7 @@
 
 #include "CGContextInternal.h"
 #include "CGFontInternal.h"
+#include "CoreText/CoreText.h"
 
 #include "Etc.h"
 
@@ -35,6 +36,27 @@
 #include <ftsizes.h>
 }
 
+const CFStringRef kCTCharacterShapeAttributeName = static_cast<CFStringRef>(@"kCTCharacterShapeAttributeName");
+const CFStringRef kCTFontAttributeName = static_cast<CFStringRef>(@"NSFontAttributeName");
+const CFStringRef kCTKernAttributeName = static_cast<CFStringRef>(@"kCTKernAttributeName");
+const CFStringRef kCTLigatureAttributeName = static_cast<CFStringRef>(@"kCTLigatureAttributeName");
+const CFStringRef kCTForegroundColorAttributeName = static_cast<CFStringRef>(@"NSForegroundColorAttributeName");
+const CFStringRef kCTForegroundColorFromContextAttributeName = static_cast<CFStringRef>(@"kCTForegroundColorFromContextAttributeName");
+const CFStringRef kCTParagraphStyleAttributeName = static_cast<CFStringRef>(@"kCTParagraphStyleAttributeName");
+const CFStringRef kCTStrokeWidthAttributeName = static_cast<CFStringRef>(@"kCTStrokeWidthAttributeName");
+const CFStringRef kCTStrokeColorAttributeName = static_cast<CFStringRef>(@"kCTStrokeColorAttributeName");
+const CFStringRef kCTSuperscriptAttributeName = static_cast<CFStringRef>(@"kCTSuperscriptAttributeName");
+const CFStringRef kCTUnderlineColorAttributeName = static_cast<CFStringRef>(@"kCTUnderlineColorAttributeName");
+const CFStringRef kCTUnderlineStyleAttributeName = static_cast<CFStringRef>(@"kCTUnderlineStyleAttributeName");
+const CFStringRef kCTVerticalFormsAttributeName = static_cast<CFStringRef>(@"kCTVerticalFormsAttributeName");
+const CFStringRef kCTGlyphInfoAttributeName = static_cast<CFStringRef>(@"kCTGlyphInfoAttributeName");
+const CFStringRef kCTRunDelegateAttributeName = static_cast<CFStringRef>(@"kCTRunDelegateAttributeName");
+const CFStringRef kCTBackgroundStrokeColorAttributeName = static_cast<CFStringRef>(@"kCTBackgroundStrokeColorAttributeName");
+const CFStringRef kCTBackgroundFillColorAttributeName = static_cast<CFStringRef>(@"kCTBackgroundFillColorAttributeName");
+const CFStringRef kCTBackgroundCornerRadiusAttributeName = static_cast<CFStringRef>(@"kCTBackgroundCornerRadiusAttributeName");
+const CFStringRef kCTBackgroundLineWidthAttributeName = static_cast<CFStringRef>(@"kCTBackgroundLineWidthAttributeName");
+const CFStringRef kCTFontPostScriptNameKey = static_cast<CFStringRef>(@"kCTFontPostScriptNameKey");
+
 static float spacing = 1.0f;
 
 static DWORD textureBuffer[1024];
@@ -1024,12 +1046,6 @@ CFArrayRef CTLineGetGlyphRuns(CTLineRef line) {
     return (CFArrayRef)[((_CTLine*)line)->_runs retain];
 }
 
-const CFStringRef kCTBackgroundStrokeColorAttributeName = (const CFStringRef) @"kCTBackgroundStrokeColorAttributeName";
-const CFStringRef kCTBackgroundFillColorAttributeName = (const CFStringRef) @"kCTBackgroundFillColorAttributeName";
-const CFStringRef kCTBackgroundCornerRadiusAttributeName = (const CFStringRef) @"kCTBackgroundCornerRadiusAttributeName";
-const CFStringRef kCTBackgroundLineWidthAttributeName = (const CFStringRef) @"kCTBackgroundLineWidthAttributeName";
-const CFStringRef kCTSuperscriptAttributeName = (const CFStringRef) @"kCTSuperscriptAttributeName";
-
 /**
  @Status Stub
 */
@@ -1238,3 +1254,67 @@ - (void)dealloc {
     [super dealloc];
 }
 @end
+
+/**
+ @Status Stub
+*/
+CTFontRef CTFontCreateCopyWithSymbolicTraits(
+    CTFontRef font, CGFloat size, const CGAffineTransform* matrix, CTFontSymbolicTraits symTraitValue, CTFontSymbolicTraits symTraitMask) {
+    UNIMPLEMENTED();
+    return nil;
+}
+
+/**
+ @Status Stub
+*/
+void CTFrameDraw(CTFrameRef frame, CGContextRef context) {
+    UNIMPLEMENTED();
+}
+
+/**
+ @Status Stub
+*/
+CFIndex CTLineGetStringIndexForPosition(CTLineRef line, CGPoint position) {
+    UNIMPLEMENTED();
+    return 0;
+}
+
+/**
+ @Status Stub
+*/
+CFStringRef CTFontCopyName(CTFontRef font, CFStringRef nameKey) {
+    UNIMPLEMENTED();
+    return nil;
+}
+
+/**
+ @Status Stub
+*/
+CGFloat CTFontGetUnderlineThickness(CTFontRef self) {
+    UNIMPLEMENTED();
+    return 0;
+}
+
+/**
+ @Status Stub
+*/
+CGFloat CTLineGetOffsetForStringIndex(CTLineRef line, CFIndex charIndex, CGFloat* secondaryOffset) {
+    UNIMPLEMENTED();
+    return 0;
+}
+
+/**
+ @Status Stub
+*/
+double CTRunGetTypographicBounds(CTRunRef run, CFRange range, CGFloat* ascent, CGFloat* descent, CGFloat* leading) {
+    UNIMPLEMENTED();
+    return 0;
+}
+
+/**
+ @Status Stub
+*/
+CFRange CTRunGetStringRange(CTRunRef run) {
+    UNIMPLEMENTED();
+    return { 0, 0 };
+}
diff --git a/Frameworks/CoreGraphics/CGGradient.mm b/Frameworks/CoreGraphics/CGGradient.mm
@@ -39,14 +39,22 @@ - (void)release {
 }
 @end
 
-__CGGradient::__CGGradient() {
+__CGGradient::__CGGradient() :
+    _components(NULL), 
+    _locations(NULL) {
     isa = NULL;
     object_setClass((id) this, [CGNSGradient class]);
 }
 
 __CGGradient::~__CGGradient() {
-    free(_components);
-    free(_locations);
+    if (_components) {
+        delete [] _components;
+        _components = NULL;
+    }
+    if (_locations) {
+        delete [] _locations;
+        _locations = NULL;
+    }
 }
 
 void __CGGradient::initWithColorComponents(const float* components, const float* locations, size_t count, CGColorSpaceRef colorspace) {
@@ -72,10 +80,10 @@ - (void)release {
             break;
     }
 
-    _components = (float*)malloc(sizeof(float) * count * componentCount);
+    _components = new float[count * componentCount];
     memcpy(_components, components, sizeof(float) * count * componentCount);
 
-    _locations = (float*)malloc(sizeof(float) * count);
+    _locations = new float[count];
 
     if (locations) {
         memcpy(_locations, locations, sizeof(float) * count);
@@ -115,17 +123,17 @@ - (void)release {
 
     int count = [components count];
 
-    _components = (float*)malloc(sizeof(float) * count * componentCount);
+    _components = new float[count * componentCount];
 
     for (int i = 0; i < count; i++) {
         id curColor = [components objectAtIndex:i];
 
         float color[4];
         [curColor getColors:color];
-        memcpy(&_components[i * componentCount], color, sizeof(float) * count * componentCount);
+        memcpy(&_components[i * componentCount], color, sizeof(float) * componentCount);
     }
 
-    _locations = (float*)malloc(sizeof(float) * count);
+    _locations = new float[count];
 
     if (locations) {
         memcpy(_locations, locations, sizeof(float) * count);